diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:16:54 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:16:54 -0800 |
| commit | 78b012f5bc05706d1ce412811ccfaa9385dae0ab (patch) | |
| tree | 48362f445e0d1ad7c0e2fa3b7c3d1cdeb2fcfee7 | |
| parent | 1c6833afd6cfdbc6c696ed0719ceedc37ec0b534 (diff) | |
| parent | 1b59ac59bb1c1f28bd40b09cd0995db873e25692 (diff) | |
| parent | f5037ad1ebb04e99622af5e99aeac0c1b44090b7 (diff) | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993