| commit | 1abb9facbbc91c8df629d9b740002d749bc5c2bc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:28 2013 -0700 |
| tree | 31241ba242b5cf8c9c93a6ef1ee2eb1ca19cd101 | |
| parent | 1a76084dd8918533b00d76fbef15888742f752df [diff] | |
| parent | 15a315776514955bfd04d5cd53a10171583d622f [diff] |
am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '0fe40641db3759088edc1bc7f0182556d77bede6':