commit | 7894ce435ac2708fb3908911fe9b9a3a30b4cfe9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:37:14 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:37:14 2012 -0800 |
tree | 9ee5b5a8bc95a0f8f7a5e965810b087f5ff75343 | |
parent | 896412bf3bcffe8e1331dd635542b4ac76c01b26 [diff] | |
parent | 76fa8e0b468b541f1020b243a8d28764e9b11b25 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I6f3ca8c4ce83100bc3da52d60b238640d9e301cb