commit | c2300d841afeb33f64cc9a3896bbbdf4bd39e62a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:04:08 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:04:08 2012 -0700 |
tree | c5743ae7eee028a3c68220151a26c1728b3ba617 | |
parent | 47e6cf3695ab15b042d85f0d8b55d1eb58e14223 [diff] | |
parent | 67beef0e0457df6d2b80ba0820d59054e5dc0fc7 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I759cbab32b17e45dd3d3e97ccf5e6039cfdff691