| commit | 11c768b7ad45e20d9182e8fe2063b3643219b400 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 14 08:35:51 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 14 08:35:51 2013 -0700 |
| tree | b0535c406014bfb36258a31c94ba4320f57f0d84 | |
| parent | 151391097e94585d4dd062098438e5c894b98d6d [diff] | |
| parent | 60d1c05bc70c5a3acf2f345cf434524aecdeab43 [diff] |
am 60d1c05b: am eb82cca7: (-s ours) am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '60d1c05bc70c5a3acf2f345cf434524aecdeab43':