diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:18:27 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:18:27 -0800 |
commit | 209cdc3b7ac92efb6427910916d04fb93083bcfa (patch) | |
tree | 5fcb94764c3e99acdc2f28f945a400e1d4660af8 | |
parent | c36184a884d817bec9d9eb1e89bdbedea329ff95 (diff) | |
parent | 08c0e3c6716d322c5237efdf3b941b7decbf175d (diff) | |
parent | 3a28950e70b47bcba2c4070c73c6ce765e55c575 (diff) | |
download | android_packages_apps_Trebuchet-209cdc3b7ac92efb6427910916d04fb93083bcfa.tar.gz android_packages_apps_Trebuchet-209cdc3b7ac92efb6427910916d04fb93083bcfa.tar.bz2 android_packages_apps_Trebuchet-209cdc3b7ac92efb6427910916d04fb93083bcfa.zip |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia95ceb234c77dafcedb79274226f4bd279c63c79