commit | 8fca8e26fe9e0d0dad83735e26399a0a80d2dbec | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:18:42 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:18:42 2013 -0700 |
tree | 3ec2c578497e9205a41b9df054479dde317a813e | |
parent | ab9c9d3ade3290e62f1272dcb6a549a2e4a57e9c [diff] | |
parent | 0befd54572d410898c82f57f7698f3b9244bd627 [diff] |
am 0befd545: am e6b059a9: am 2fa4d0ef: am 9067a62a: (-s ours) am de97f9c2: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0befd54572d410898c82f57f7698f3b9244bd627':