commit | 20eb840e930e0fe98e42882148da4547da569139 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:29:03 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:29:03 2012 -0700 |
tree | 0cc78d539aa33660907536cfb80268953f0aee3a | |
parent | dcbeb813d0a88159202ad711209e90dfca1f596a [diff] | |
parent | 10aee40577cd1adfefa8ef7acce728f30a1c3d7c [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I317b42faec06d2263a72eca468ba9673f1bd4372