commit | 958e66fe1803a6bf5880ad11c43825aa5a55a260 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:16 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:16 2013 -0700 |
tree | f1e1174d74f608217caffc6b9798bfa4d9fe98e5 | |
parent | 82574cb101d34981bccd56513059b3d0bd3267a0 [diff] | |
parent | 3061af8a7eee5e06596f67ccab0f8e0722d01354 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Ic1c996fd98ce4f0db3bbe40a3f3fe9cb1504d3ab