| commit | 5b9e76325fd54607a5f34ddd32a93a2260180097 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:19 2013 -0700 |
| tree | 49824681120fbe00997aa3f08ef707b35d825a5c | |
| parent | 9eae3cdc840835fc2a6a7dacd7382dbcce2e75ed [diff] | |
| parent | 994edbe96c6b12a6ada317d225909c09da772b70 [diff] |
am 994edbe9: am eb0df747: am c3879c0b: am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '994edbe96c6b12a6ada317d225909c09da772b70':