tree 9709ca4c108f1b46ac93c1a3801f527ffe9f1251
parent 3a9795463ac83bb8d0a041ef041139a82398b72e
parent debc264b5b9b86dcbdc63238faea9079730be722
author Jiyong Park <jiyong@google.com> 1502255754 +0000
committer android-build-merger <android-build-merger@google.com> 1502255754 +0000

Merge changes from topic 'mark_vndk' into oc-mr1-dev
am: debc264b5b

Change-Id: I55d3391d8a552f26e0b0cba5f9216c796aa136ee