| commit | dedef1e4987b0dbfbe5e089b306b5ab8022bd02b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:34:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:34:29 2013 -0700 |
| tree | 5e2c5df025e51a1faf8b85f3bf0585b77cf2c555 | |
| parent | aeeccf5214d9a1263fcdc2af1f7c7ac3efee236c [diff] | |
| parent | 613541b2fdc2b4503f7263551c8b3f25c0565110 [diff] |
am 613541b2: am 4a7ec0f3: am 8efbf9e5: (-s ours) am 53e16ebc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '613541b2fdc2b4503f7263551c8b3f25c0565110':
