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