OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 927acf7 e71c01d)
Merge "Fix build error from diamond merge" am: 52da663d0a
authorCourtney Goeltzenleuchter <courtneygo@google.com>
Tue, 24 Oct 2017 23:36:16 +0000 (23:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Oct 2017 23:36:16 +0000 (23:36 +0000)
am: e71c01d834

Change-Id: Iac7a2bfa00ad8c5479fe2fe6589cd7517f3673ce


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