commit | f01862c933fe03dbd411a668629b3ea367102830 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:37:09 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:37:09 2012 -0700 |
tree | 03700a63195ca3af3987aaf526edbcc69a0ecf77 | |
parent | 7faf750f4a0868afd2d0692a96794ccecb2ede28 [diff] | |
parent | b845ce4af134824f1dcaf11394ae350964aa0736 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ia33edf3e502ec25303cc0dae104c955cd5cfa3fe