| commit | 8c60e0e3656b11554a7b857e42d9e5ee42fc6809 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:59:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 05:59:16 2012 -0700 |
| tree | c4a1e6e6451ac325008d6902a94bb1f44a8c77d1 | |
| parent | 9f997217cf62eaf6cd5c944e9cd8d94643c9adb0 [diff] | |
| parent | ca5aae2425a88ddc0bdf7f03569848fd67e603d2 [diff] |
am ca5aae24: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ca5aae2425a88ddc0bdf7f03569848fd67e603d2':