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:
fbc47f7
051d6b7
)
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more...
author
Adam Seaton
<aseaton@google.com>
Tue, 23 Aug 2016 00:17:03 +0000
(
00:17
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 23 Aug 2016 00:17:03 +0000
(
00:17
+0000)
am:
051d6b74eb
-s ours
Change-Id: I790f9bb052f72c89e84fc1b41942a1707cdc43e4
Trivial merge