| commit | 7298e5ab20b37767cab89e7bc5784eb99d46a749 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:54 2013 -0700 |
| tree | 5862b78d667371e87353d024d877a07edf11fa94 | |
| parent | 930540de4415795500e22f02bb707768b7742fc6 [diff] | |
| parent | 2f3c1638351db28f560acb819772a397d47d4192 [diff] |
am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2f3c1638351db28f560acb819772a397d47d4192':