| commit | fc18d9ad637cd96767d711e4cc7c06041c626850 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:28 2013 -0700 |
| tree | b59d6a750d1a45eca77e6be2143fc9668d50fece | |
| parent | 81a0690f93c021e189976a476c20fc5aab4841a5 [diff] | |
| parent | 8c9224795d3ffff8b8e79595fc50083ff0f05bc9 [diff] |
am 8c922479: (-s ours) am 79c111c5: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8c9224795d3ffff8b8e79595fc50083ff0f05bc9':