OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c3ce7a
224b7f3
)
Merge "ART: Don\'t attempt write flock if not zygote"
author
Andreas Gampe
<agampe@google.com>
Tue, 5 Apr 2016 23:07:45 +0000
(23:07 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 5 Apr 2016 23:07:45 +0000
(23:07 +0000)
am:
224b7f3
* commit '
224b7f346d8e13ef7b19d72671d687cad34f63eb
':
ART: Don't attempt write flock if not zygote
Change-Id: I2e3aacde20d96b7c2b5ace695185d005d8320784
Trivial merge