| commit | b46674978765e29d838eb7e5d4810d047037f855 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:33 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:33 2013 -0700 |
| tree | 50a5aeea4dd2de1ca316d645c7155d5f7460e704 | |
| parent | b7871af2fbde70c7cf4812d5710b2729588bac54 [diff] | |
| parent | ae01017f4d94c8fe0b96f7504cc6ef6384e0e5c8 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Id080dc52375e30cfad7c1b6df9be754c2bb8c6fa