| commit | 6e5236ee082070242f6e5e6e0fe0d1892368880e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:32:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:32:00 2013 -0700 |
| tree | cd37ae4cde342686fc4cc4fbfdb5dd6774429789 | |
| parent | 4c645d0a9bd4721fe65f1c2264fed7a5830428a2 [diff] | |
| parent | 5c8f84a15fba998baf9703c81e86a25048ce368a [diff] |
am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5c8f84a15fba998baf9703c81e86a25048ce368a':