summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-08 15:44:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-08 15:44:33 -0800
commite3c6084bba071f07edf90e36ab02e4f2306ce403 (patch)
tree0599b8c1bb574908f1254251b9ac532a2c57f4c9
parent3a47ffb453fbb496024d9a311a681b7333dd7004 (diff)
parenta34f71153cebf524807767886dad4defc32d8d4d (diff)
downloadandroid_frameworks_ex-e3c6084bba071f07edf90e36ab02e4f2306ce403.tar.gz
android_frameworks_ex-e3c6084bba071f07edf90e36ab02e4f2306ce403.tar.bz2
android_frameworks_ex-e3c6084bba071f07edf90e36ab02e4f2306ce403.zip
am a34f7115: Reconcile with jb-mr1-release - do not merge
* commit 'a34f71153cebf524807767886dad4defc32d8d4d':
0 files changed, 0 insertions, 0 deletions