| commit | fbde5ec436b28bdcd467a584f1d97d50b11ca5d9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Mar 29 09:54:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 09:54:37 2013 -0700 |
| tree | 33e98ac517ee16f4ec66c4a05fb7abf249a3cc52 | |
| parent | 3e0f97d28191bc39ee874a7e4e988b9b2bc3943a [diff] | |
| parent | ac0d2e9fc0a6c5b86dcbcacbf9ac6ad8810cbdb1 [diff] |
am ac0d2e9f: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'ac0d2e9fc0a6c5b86dcbcacbf9ac6ad8810cbdb1':