| commit | 88974a28a1ff613ad000b47390b205b2fbf9f67e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:42 2013 -0700 |
| tree | 6dc30ebaeb8af3a17da6553a992c55ef27e994e0 | |
| parent | 1d36e62ecd2daf407e2b9185b04f980137a86274 [diff] | |
| parent | 9f7e9d8149bc85e13577a4974f1de7e45831fb9d [diff] |
am 9f7e9d81: am 7259dfe6: am 342de69f: am fffd02e9: (-s ours) am a8497f6f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9f7e9d8149bc85e13577a4974f1de7e45831fb9d':