| commit | 29434681bcb2cf348411f790887473a41855baf8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:31 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:31 2012 -0800 |
| tree | 84363855e22bd883dea8b56ac8418fb73017d96b | |
| parent | 1273f1b7ace1772bc115f4252f2925de0c5c102d [diff] | |
| parent | f97103b5f0e5a65a81f60bbe39cd563b655ce020 [diff] |
am f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'f97103b5f0e5a65a81f60bbe39cd563b655ce020':