| commit | 1f11a044fbc48d75e7a3cc2aaaffb02f5f0dd906 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Jan 23 22:53:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 23 22:53:46 2015 +0000 |
| tree | 6c06753bea1173b989c8a2fcf3ff74f764100c8e | |
| parent | fac2ba1b22fbf7010a270f6e8ca1ea8cf9e35357 [diff] | |
| parent | 44124c94e7eb28d2d952cbbf18c3ea5e14ebd4b0 [diff] |
am 44124c94: (-s ours) am 980417bf: Merge "ART: On shutdown, only warn on mutex contention" into lmp-mr1-dev * commit '44124c94e7eb28d2d952cbbf18c3ea5e14ebd4b0': ART: On shutdown, only warn on mutex contention