commit | cf7bd88327618664ea31bc9ee2cb76368d0de44b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:18:47 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:18:47 2012 -0700 |
tree | 7102f0993e90834984c91e0d5beddc7f7a01f4ac | |
parent | 6ebf0aa4df1a2484f52a894384286a084ac0a129 [diff] | |
parent | 9f99e382ef161dda2ff137ea8be80f26f150399e [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie754a300e8665e6dfd25260714851d7bbe99261f