diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-10 09:45:34 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-10-10 09:45:34 -0700 |
commit | e37fa97752cb0e8b79b94f1c1745894b40b7d57e (patch) | |
tree | 0cf8ab227bb7224b7a3705a3ccf451c35c5fcfbf /res | |
parent | 5d1e9a5f54d0937e7e5565687b3cc85791239c6d (diff) | |
parent | 560e16197a607715ac9a2b26ce40928a5e782280 (diff) | |
parent | c242ae404d2e2dadf16284b5d367f5523fbafc75 (diff) | |
download | android_packages_apps_Trebuchet-e37fa97752cb0e8b79b94f1c1745894b40b7d57e.tar.gz android_packages_apps_Trebuchet-e37fa97752cb0e8b79b94f1c1745894b40b7d57e.tar.bz2 android_packages_apps_Trebuchet-e37fa97752cb0e8b79b94f1c1745894b40b7d57e.zip |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286