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:
835a6d6
41834dc
)
Merge "ART: Don\'t attempt write flock if not zygote" into nyc-dev
author
Andreas Gampe
<agampe@google.com>
Tue, 5 Apr 2016 21:16:00 +0000
(21:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 5 Apr 2016 21:16:00 +0000
(21:16 +0000)
am:
41834dc
* commit '
41834dc226b4842eea3b296bc8acd22663ac3eb1
':
ART: Don't attempt write flock if not zygote
Change-Id: Ib939ab67aeb083f1cb2e964a2d77b917ad0fe05a
Trivial merge