| commit | 0ce4ac5a1886315fd9da992bfeae82b595e75ae3 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Apr 05 23:07:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 05 23:07:45 2016 +0000 |
| tree | 905bbd70e9f2dd033228edcba5ae92b5d3d84f15 | |
| parent | 6c3ce7a7aca25efb0cb2e9b5ea29b82a014e050e [diff] | |
| parent | 224b7f346d8e13ef7b19d72671d687cad34f63eb [diff] |
Merge "ART: Don\'t attempt write flock if not zygote" am: 224b7f3 * commit '224b7f346d8e13ef7b19d72671d687cad34f63eb': ART: Don't attempt write flock if not zygote Change-Id: I2e3aacde20d96b7c2b5ace695185d005d8320784