| commit | 121361c3b41c9c3d4016e4658be88d98bc8cbca1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:17:42 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:17:42 2012 -0700 |
| tree | 0335ce93c58637fd4cfa6b18f74e49066dbaf07b | |
| parent | 741989cb55f8ffbc4ffa82d8ea87afca367c81ce [diff] | |
| parent | 26042e844473a3480615a914d4539d0c6563e159 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic8b2288c1cc20c8e00805637e3d746438b3e000e