| commit | 7121fc1f4ed2e49989aa13e3cd1840017d609e59 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:07:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 14:07:20 2013 -0700 |
| tree | 7e3b0778abacfe37d468cfd01c71b8077f5dbc0d | |
| parent | afbfde9f58a7265ad6e8a9e4d3e225f444f4391c [diff] | |
| parent | 9bf5a42ad3a67e2b08863af6e9a500830bce16fe [diff] |
am 9bf5a42a: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9bf5a42ad3a67e2b08863af6e9a500830bce16fe':