OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b4fe6e 6a1c222)
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more...
authorTim Murray <timmurray@google.com>
Tue, 23 Aug 2016 15:24:55 +0000 (15:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 15:24:55 +0000 (15:24 +0000)
am: 6a1c2227be  -s ours

Change-Id: I4a384d1e1ea2cfb822fe56bbc3c0197891919678


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help