OSDN Git Service

Merge "ART: Don't attempt write flock if not zygote" into nyc-dev
authorAndreas Gampe <agampe@google.com>
Tue, 5 Apr 2016 21:03:35 +0000 (21:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Apr 2016 21:03:35 +0000 (21:03 +0000)

Trivial merge