summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2015-03-23 22:27:51 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-23 22:27:51 (GMT)
commitd9e79df27877ea2b7bf55044f4bde687f28a6ac5 (patch)
treebf7fdbb6d4c1e8018e2abf2227bf6eeb57c48d52
parent2ae49ab73f4ace163b9b6aa9e59e15cc5cc4cfd5 (diff)
parent25a2979c374bda4f4aa26b26bc72a28fa55f38cf (diff)
downloadandroid_frameworks_ex-d9e79df27877ea2b7bf55044f4bde687f28a6ac5.zip
android_frameworks_ex-d9e79df27877ea2b7bf55044f4bde687f28a6ac5.tar.gz
android_frameworks_ex-d9e79df27877ea2b7bf55044f4bde687f28a6ac5.tar.bz2
am 25a2979c: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit '25a2979c374bda4f4aa26b26bc72a28fa55f38cf':
0 files changed, 0 insertions, 0 deletions