OSDN Git Service

Merge "ART: Don\'t attempt write flock if not zygote"
authorAndreas Gampe <agampe@google.com>
Tue, 5 Apr 2016 23:07:45 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Apr 2016 23:07:45 +0000 (23:07 +0000)
commit0ce4ac5a1886315fd9da992bfeae82b595e75ae3
tree905bbd70e9f2dd033228edcba5ae92b5d3d84f15
parent6c3ce7a7aca25efb0cb2e9b5ea29b82a014e050e
parent224b7f346d8e13ef7b19d72671d687cad34f63eb
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