OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b87f3e8 d3b5669)
resolve merge conflicts of d3b56698c to oc-dev-plus-aosp
authorJeff Hao <jeffhao@google.com>
Wed, 19 Apr 2017 20:37:47 +0000 (13:37 -0700)
committerJeff Hao <jeffhao@google.com>
Wed, 19 Apr 2017 20:37:47 +0000 (13:37 -0700)
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iae7fc90e9281102fb32dcc214838f590b9576f7a


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