| commit | 994edbe96c6b12a6ada317d225909c09da772b70 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:06:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:06:41 2013 -0700 |
| tree | 3356e4c635f6913d10fbc857cefcbd63d8702ffd | |
| parent | 35aa1c14769acad1086349bb63fb290f577934ce [diff] | |
| parent | eb0df7475b03fc0f3a26e6e7976cfc34fd3ae18f [diff] |
am eb0df747: am c3879c0b: am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'eb0df7475b03fc0f3a26e6e7976cfc34fd3ae18f':