| commit | e6f2da87329fa2d4e109498873610038808d0d78 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:31 2013 -0700 |
| tree | 756ba3c932d05b964ae38900623c5b2c0bb4758f | |
| parent | b3c37a31ccffe137cc9b1c1068bb99d3d00a2ee4 [diff] | |
| parent | 95989f8eea2a6804fb63465dde4b8a1c39a91c8a [diff] |
am 95989f8e: am eb137dc8: am f92780b7: (-s ours) am b60c1ed9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '95989f8eea2a6804fb63465dde4b8a1c39a91c8a':