| commit | 637913e0691334af3d7354d2d7b86d587728638a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:44 2013 -0700 |
| tree | b006358a28cb534dd70dcc8ce056ce548978a8c9 | |
| parent | 9e43c0556550d16e72cd933f8dd95f21bc6ed094 [diff] | |
| parent | 91713500f60c6bb1a6c7fba1e1981a394eb70950 [diff] |
am 91713500: am 10487cee: am fc18d9ad: am 8c922479: (-s ours) am 79c111c5: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '91713500f60c6bb1a6c7fba1e1981a394eb70950':