OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e1532a bb7e1b6)
resolve merge conflicts of 8a094116b to stage-aosp-master
authorIan Elliott <ianelliott@google.com>
Tue, 18 Jul 2017 20:03:22 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 20:03:22 +0000 (20:03 +0000)
am: bb7e1b68e6

Change-Id: I453a7aaf28c20634337ac70ea6586d5a10d4736c


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