| commit | ad96d5ced83767bf3ee821dbd5702a0fee4d4095 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 07:28:00 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 07:28:00 2012 -0800 |
| tree | dc538e4f156da0107748612e3449ec4768170a62 | |
| parent | c9b55965d5fc57de7a71f414318ec11768f1df8d [diff] | |
| parent | 60acb59089c1e73f74da900d98dc48924a2fabc4 [diff] |
am 60acb590: (-s ours) am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge * commit '60acb59089c1e73f74da900d98dc48924a2fabc4':