commit | ace7d0aee5d1dcbcabc8bf075e8ee21e21e747ac | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 22 13:40:41 2013 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 22 13:40:41 2013 -0800 |
tree | 1dd9fbc3691193b7ef6bbf7f1f16be2803104a58 | |
parent | 702aad5cb384438c8720fac5ee37ff09a23b9706 [diff] | |
parent | e8a297a0927fcdec71174dbd06869e5ba0d547fe [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I3e2d9d32a15a2cc3ac8d3f7f25a92ddcbcc4b093