| commit | 82c9851ac6dd9ba07a4c341461602ebf2edef33d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:23 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:23 2012 -0800 |
| tree | abb3a4bf9214fc94115d65f4f7777f88b51fc843 | |
| parent | 6062eb0756cb94cd164223f5961091b78fcc43d4 [diff] | |
| parent | fd1523d782fcf402b5ee033d4134d8601d31c6c9 [diff] |
am fd1523d7: (-s ours) am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'fd1523d782fcf402b5ee033d4134d8601d31c6c9':