| commit | b0ddf9b51594fd0457bca1666373c40544669f1e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 13 22:36:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 22:36:23 2013 -0700 |
| tree | ac40e85cdaf944780837f9987610c1dd6c55cf1e | |
| parent | 3edd781b33ee41fd4e0aad59492fcacee275ab57 [diff] | |
| parent | be482d966527bf6894e23533afbe7d586c7f0f34 [diff] |
am be482d96: (-s ours) am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'be482d966527bf6894e23533afbe7d586c7f0f34':