OSDN Git Service

(root) / android-x86 / device-generic-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dac24c 3bc992f)
resolve merge conflicts of 3bc992f to oc-mr1-dev-plus-aosp
authorJustin Yun <justinyun@google.com>
Fri, 29 Sep 2017 03:53:53 +0000 (12:53 +0900)
committerJustin Yun <justinyun@google.com>
Fri, 29 Sep 2017 03:53:53 +0000 (12:53 +0900)
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic601841ff071618110eb47141d5e98d3d7ae66bb

1  2 
vndk/vndk-sp-libs.mk patch | diff1 | diff2 | blob | history

diff --cc vndk/vndk-sp-libs.mk
Simple merge
device/generic/common
About OSDN
Find Software
Develop Software
Help