commit | 5194366bcdb91d5908c8db50f002a891fe8b8bde | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 13:07:03 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 13:07:03 2012 -0800 |
tree | 4ffa3d9c5bb05c59aa2324de213b7cc75600dbda | |
parent | 79ab2553a77c0f111e990e3aec342ce0cde87fc9 [diff] | |
parent | 8803150a7b311316d6003bc164dcab8eb6f98b75 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I482192b20bde4fcc55f9a781e37256d396c2c9fb