diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-15 07:39:01 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-10-15 07:39:01 -0700 |
| commit | 9155fe81a9844b78f90f340dad36c106768aae6b (patch) | |
| tree | 7a6fcde317da44077cff3d763f6b2114549e34fa | |
| parent | ee2a5e9d14a0f1d02037c18a7c07f87b308b2cae (diff) | |
| parent | 3d96c16eecef321ee20d749804e4b4a6f87326d9 (diff) | |
| parent | 055ac959791da703d4e4b3f9f073968a5f1101fb (diff) | |
| download | mms-9155fe81a9844b78f90f340dad36c106768aae6b.tar.gz | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Iaffda05bc8f285a7b4fdb8477608f228a42733f6