| commit | 15a315776514955bfd04d5cd53a10171583d622f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:27 2013 -0700 |
| tree | e9bdb0a8eef7eff82045b95e8cfcb26d3807ef6b | |
| parent | 64143ff27c2ffd8bd91ee9451305704e6b54ac6e [diff] | |
| parent | 0a6fba48af31916208a20b2bf142ac7dea0a014a [diff] |
am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '72c7cf9d13f5a51a71dccc6d94317727bd0feec3':