| commit | be482d966527bf6894e23533afbe7d586c7f0f34 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 13 22:34:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 22:34:47 2013 -0700 |
| tree | f365064955324801bd043e2d1d9b2c348d03acc6 | |
| parent | d1dd7fbb468e76ef322bff7bf74e09fbacf8c731 [diff] | |
| parent | 9942cb83c438238e5b486b20c07c166c727b00c6 [diff] |
am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9942cb83c438238e5b486b20c07c166c727b00c6':