OSDN Git Service

(root) / android-x86 / hardware-interfaces.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 974d1d3 26ce593)
resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf am: c278e0ae1...
authorsqian <shuoq@google.com>
Wed, 19 Jul 2017 00:34:05 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 00:34:05 +0000 (00:34 +0000)
am: 26ce593c1e  -s ours

Change-Id: I75e44f407a5bce113573c6e2f8e5bbc6762d762f


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