diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:17:23 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:17:23 -0800 |
| commit | 188bd32cb36757ca2a007b66becdaf31abed41af (patch) | |
| tree | acfc8b558580f0421840af5f9e94b328e18c1a90 | |
| parent | 4c80e1addeee093e0b9e7ad6f918cdcda92f6c3b (diff) | |
| parent | 3d96c16eecef321ee20d749804e4b4a6f87326d9 (diff) | |
| parent | b43774ad8fe7855acb2b23837003b44cebabdc73 (diff) | |
| download | mms-188bd32cb36757ca2a007b66becdaf31abed41af.tar.gz | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeandroid-cts-4.2_r2
Change-Id: I87313b00fc7435d079f0270cf0140dd57436e67a