OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
effaf79
fbc47f7
)
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO...
author
Tim Murray
<timmurray@google.com>
Tue, 23 Aug 2016 15:24:54 +0000
(15:24 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 23 Aug 2016 15:24:54 +0000
(15:24 +0000)
am:
fbc47f734f
-s ours
Change-Id: I2174dc610823bc9a9ea58bbd55a30095db569c09
Trivial merge