| commit | 49e633241c872a31559d934bf25d51c9beb65ea0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:36 2013 -0700 |
| tree | d2cd9bbbcf31658025d183fcdf8b67fe809a701e | |
| parent | cd90cf3e078b6da90f7c0e313acc98772d68ad88 [diff] | |
| parent | 565af3834c8c4c353fd9bbdffcf2b7817b55f09b [diff] |
am 565af383: am 33adccd2: am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '565af3834c8c4c353fd9bbdffcf2b7817b55f09b':