commit | 7776457df5639aef8e836cded2de28118e2841da | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:29:23 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:29:23 2012 -0700 |
tree | 24cd55ac7cf585c2dae68a2a11148205643029f7 | |
parent | e3a8cd4db13494400a88da88f2e0190f5d286011 [diff] | |
parent | c0609a2743b09908a969e14e2351bcc786ea6365 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091