| commit | 0eb8661d42503be5c99fecdc460421e18ebf1637 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 14 09:11:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 14 09:11:23 2013 -0700 |
| tree | 51b0ebfc4aa471f993304fa66e08dee7fd39bf55 | |
| parent | 9766417de07b45fa21bf313a378265d527b2df37 [diff] | |
| parent | 11c768b7ad45e20d9182e8fe2063b3643219b400 [diff] |
am 11c768b7: (-s ours) 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 '11c768b7ad45e20d9182e8fe2063b3643219b400':