diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-28 09:49:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 09:49:35 -0800 |
commit | 553e157a0f481b70c990e216b1c7b6a0a2b98610 (patch) | |
tree | cf4f33a9eb00bcb96381143e77e128768ed96ae4 /res | |
parent | 0e9530291ab64a7e788047110650844539bc7e95 (diff) | |
parent | ee76e18125438183d7e7bfa5e2b10172fcf565ec (diff) | |
download | android_packages_apps_Trebuchet-553e157a0f481b70c990e216b1c7b6a0a2b98610.tar.gz android_packages_apps_Trebuchet-553e157a0f481b70c990e216b1c7b6a0a2b98610.tar.bz2 android_packages_apps_Trebuchet-553e157a0f481b70c990e216b1c7b6a0a2b98610.zip |
am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'ee76e18125438183d7e7bfa5e2b10172fcf565ec':
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions