| commit | a6db845d24104eca99a0174af9fcaa713e838517 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:02:29 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:02:29 2012 -0700 |
| tree | cd14ec94f2dc16feac7aa5cf7546dfe45a72a33b | |
| parent | 768ebe51f4490cd8a84a42b13f84ba5e6a366d11 [diff] | |
| parent | decac39d59fa3630d70ecb7a8cdd2703f6fbd3c3 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I2c181ef0dd06df0086bd941ccf69b5c6aca437d0