| commit | 76b149158bebe5ae8259d1db497fc38b5c5ef37b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:23:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:23:01 2013 -0700 |
| tree | acfc8b558580f0421840af5f9e94b328e18c1a90 | |
| parent | 188bd32cb36757ca2a007b66becdaf31abed41af [diff] | |
| parent | 61c0f4fa6f2e3049018f70706227cc256a529801 [diff] |
am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '61c0f4fa6f2e3049018f70706227cc256a529801':