| commit | 884725e89ee5d1230b0b7630e8dda011a6dffcef | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Apr 05 21:19:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 05 21:19:16 2016 +0000 |
| tree | e8e2b81a6608cb86e610af8e7c47aaa520386c21 | |
| parent | 2356a6cdb1234f7b7ec994a49abdd4f3883a0dff [diff] | |
| parent | d6125efcac6ea62ddc316a4e62f5e535ddfbf8b3 [diff] |
Merge "ART: Don\'t attempt write flock if not zygote" into nyc-dev am: 41834dc am: d6125ef * commit 'd6125efcac6ea62ddc316a4e62f5e535ddfbf8b3': ART: Don't attempt write flock if not zygote Change-Id: Ia5868bfccd45120077c658e6ecc9b0763cc3e009