| commit | 6292bd70d5ced108db6becc198eeb2a3a3113638 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:50 2013 -0700 |
| tree | 00e7004af45893bbf047a860c428eeb0c6b1cab8 | |
| parent | be6cd8f75c858d95ae44d3b220557473e695317a [diff] | |
| parent | 7bf0939e106c975ac897b5d701e116b6c86ab75a [diff] |
am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7bf0939e106c975ac897b5d701e116b6c86ab75a':