OSDN Git Service

(root) / android-x86 / device-generic-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7135a3ca37970551a85d477650e43717b1094987
tree21bb385701d0c98a52af2687fc86f50e55cf51c0tree | snapshot
parent5dac24ca3efd56c0f2304b722abd7ad2ee0f8e91commit | diff
parent3bc992fb7a910939fd55466f6816a90b3933172bcommit | diff
resolve merge conflicts of 3bc992f to oc-mr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic601841ff071618110eb47141d5e98d3d7ae66bb
vndk/vndk-sp-libs.mk diff1 | diff2 | blob | history
device/generic/common
About OSDN
Find Software
Develop Software
Help