commit | a8293416f518a38b94ae6b39efc7490d34f09e85 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 07:55:03 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 06 07:55:03 2012 -0700 |
tree | 3171014a8a73f77c618d8be6a92174a62787e050 | |
parent | 28cf87f74cab38e2c381df1a5fea39fe22af557a [diff] | |
parent | 7a8fd23eb239464950b21dcdaf6afda2a90bc502 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib413b5627f3ab9e6fa6d8fc1775da5f12a704b14