diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-28 00:32:55 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-28 00:32:55 -0700 |
commit | 05ea1beadefe1cc6bc4b839ea91d78227fd03701 (patch) | |
tree | f8642118f31bc6564dddb7422c673a66fa61b5bd /res | |
parent | 9b83c95e4c5b7d1a541e68d845348bae6adef7a3 (diff) | |
parent | 5ea382d2080a5854ac9c8397e27d2b895e520470 (diff) | |
download | android_packages_apps_Trebuchet-05ea1beadefe1cc6bc4b839ea91d78227fd03701.tar.gz android_packages_apps_Trebuchet-05ea1beadefe1cc6bc4b839ea91d78227fd03701.tar.bz2 android_packages_apps_Trebuchet-05ea1beadefe1cc6bc4b839ea91d78227fd03701.zip |
am 5ea382d2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '5ea382d2080a5854ac9c8397e27d2b895e520470':
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions