| commit | 93bb0058bd3e5c0703797289f88a033789249766 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:42:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:42:00 2013 -0700 |
| tree | 257e3dcf4801f649618a44c453253c016d953903 | |
| parent | a7c17deb32fe28230b77b0dff17bb113088a5c16 [diff] | |
| parent | 4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad [diff] |
am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad':