commit | 30ca8004cf259c5dceab5cec06cab5ae9a17d89b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue May 28 07:37:26 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue May 28 07:37:26 2013 -0700 |
tree | 779d2d32ae4371ef43ce3abc87097ca6fa75cec0 | |
parent | dd6b47e675a9601280ee1375fccee7c1ec01d9eb [diff] | |
parent | 1352352dd92ea31704c375a4a4f08f2ae9d2c142 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Id0d9ce35d7c0fe8ec3d2edd00e42df41fba064ea