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