| commit | 97652731272a54eb318d835387e73c325440dcd0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:11:24 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:11:24 2012 -0700 |
| tree | 3cd6baec6aa9da10d632285b5b5a61de50023ac6 | |
| parent | 7145ca713854d090eb5c3ceeb588748f575764e3 [diff] | |
| parent | 36b871ae0c634cfbc63a6c5d47e6a9fad9b63257 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I12ca58a05a6640c7db80f88ce271131f164fed10