summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-08 15:52:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-08 15:52:03 -0800
commit9a5bd4040c704812e5b7cc80825f8cc9eec8c37e (patch)
treeff053b52bb4b128aba1a9b8458d0ef0a9cde79bc
parent96f90da26ff4caa0d6b24cbdbca53a893d17635e (diff)
parente3c6084bba071f07edf90e36ab02e4f2306ce403 (diff)
downloadandroid_frameworks_ex-9a5bd4040c704812e5b7cc80825f8cc9eec8c37e.tar.gz
android_frameworks_ex-9a5bd4040c704812e5b7cc80825f8cc9eec8c37e.tar.bz2
android_frameworks_ex-9a5bd4040c704812e5b7cc80825f8cc9eec8c37e.zip
am e3c6084b: (-s ours) am a34f7115: Reconcile with jb-mr1-release - do not merge
* commit 'e3c6084bba071f07edf90e36ab02e4f2306ce403':
0 files changed, 0 insertions, 0 deletions