diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-10 09:44:46 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-10-10 09:44:46 -0700 |
commit | 15480409f3b085b3292af0ec894d2bed2bc147a2 (patch) | |
tree | c6f827a58b7a3662745289557272eb6f55ae7039 | |
parent | a7fc89ae6184eb8b92fd229e45ffa0bbe7bbf1da (diff) | |
parent | 62ee468e7b1239c9882870a49b91aa98d59e99d0 (diff) | |
parent | 23234247e025176fc03cd33c12845d489f4d3a43 (diff) | |
download | mms-15480409f3b085b3292af0ec894d2bed2bc147a2.tar.gz |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ic06ba79213c8ce2c41c8282a333456fd8304636b