| commit | 096d7faf0c79bdb2ee0b6f9bacbb4f1749cbd4af | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 00:32:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 00:32:19 2012 -0700 |
| tree | d3cd7591250a85b7db17b7f08d5c9422f5deb31d | |
| parent | 696923ac7ff5a71f6a80f18c813f465ffb53cc58 [diff] | |
| parent | 90b655315e9edcc6d253db0d06f829be55c7818e [diff] |
am 90b65531: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '90b655315e9edcc6d253db0d06f829be55c7818e': JOO89 JOO88C JOO88B