summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-31 14:52:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-31 14:52:54 -0700
commitcb4a1e65ff9e416d5a6a56628cc8732aa5066761 (patch)
treebebef3e8b8d9ef0842d6591508d78f58300dd5bb
parentabb3d697c872dbc29ce5cfa376369e724c7e362c (diff)
parent8a7d620aa0ad7bada6f50b757d1bc328db1fe257 (diff)
downloadandroid_packages_apps_Trebuchet-cb4a1e65ff9e416d5a6a56628cc8732aa5066761.tar.gz
android_packages_apps_Trebuchet-cb4a1e65ff9e416d5a6a56628cc8732aa5066761.tar.bz2
android_packages_apps_Trebuchet-cb4a1e65ff9e416d5a6a56628cc8732aa5066761.zip
am 8a7d620a: am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '8a7d620aa0ad7bada6f50b757d1bc328db1fe257':
0 files changed, 0 insertions, 0 deletions