commit | 14eec71ec3aed9df393a39a5cfade21897c866ec | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 21:01:15 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 21:01:15 2013 +0000 |
tree | e21ec4e62268bfa0d5e700838c919d03cb7f2745 | |
parent | 0da7f6c8201b27938d3b9f048d71fd784cd1df9a [diff] | |
parent | 4a2e54c7642d97873cc9f0d6c4387a0b0aa5a697 [diff] |
am 4a2e54c7: (-s ours) am 9f9d5bfe: am 55d176e6: am b5beb2b3: (-s ours) am af11e9a6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4a2e54c7642d97873cc9f0d6c4387a0b0aa5a697':