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