OSDN Git Service

resolve merge conflicts of 4bc9219d to oc-dev-plus-aosp
authorMark Salyzyn <salyzyn@google.com>
Tue, 6 Jun 2017 17:09:33 +0000 (10:09 -0700)
committerMark Salyzyn <salyzyn@google.com>
Tue, 6 Jun 2017 17:11:10 +0000 (10:11 -0700)
commit9d02ca813fb73c878bef7dd706e6f2cd1e4564c8
treee724274a0a8bf88fc032ad88c7f5515227cd3de0
parentf2fa27393c59ec00cd4057e5ef2514dbfda3611b
parent4bc9219dee97713d141d76ecb33be358420a1b91
resolve merge conflicts of 4bc9219d to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: 37753761
Change-Id: I4898abc8dd63fdfb4c4ca8a6e69a6198c4882cb3
tests/kernel.config/Android.mk