| commit | 64bdb3a9fee56b25c8463b8238f8969bc6687cfa | [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 | 48821d607dd5088e206086115203874dfa24788e | |
| parent | 60ed689447da99eb18a06895c4139c6dc31165d2 [diff] | |
| parent | cc8aa2e130c6640116bd993f3313e639a96a3ff1 [diff] |
am cc8aa2e1: (-s ours) am 87b319cb: am b3ce9346: am 91e4fd6c: am 61ea9d98: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cc8aa2e130c6640116bd993f3313e639a96a3ff1':