| commit | 46ac102256c58de9301c9c69201711657a5102a5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:56:21 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:56:21 2013 +0000 |
| tree | 713a573d7438f68c41cdb549a974bb03b90049bd | |
| parent | c6a022a715d8559dca637fcbc099e326ea107d80 [diff] | |
| parent | 88974a28a1ff613ad000b47390b205b2fbf9f67e [diff] |
am 88974a28: (-s ours) am 9f7e9d81: am 7259dfe6: am 342de69f: am fffd02e9: (-s ours) am a8497f6f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '88974a28a1ff613ad000b47390b205b2fbf9f67e':