OSDN Git Service

(root) / android-x86 / hardware-interfaces.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d640e70 c278e0a)
resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf
authorsqian <shuoq@google.com>
Tue, 18 Jul 2017 23:57:59 +0000 (23:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:57:59 +0000 (23:57 +0000)
am: c278e0ae17  -s ours

Change-Id: I5286e807f04a839eeb5fbcddf8a278354979b58a


Trivial merge
hardware/interfaces
About OSDN
Find Software
Develop Software
Help