tree 8465d199e0a3d2148d1d1e6cd33cf0650a3eed32
parent 5db6c1cd24822912cc5df291088fb85c63a857aa
parent 5bed6372b81b6c14a630df377cbc52b888fd8dcf
author TreeHugger Robot <treehugger-gerrit@google.com> 1501739380 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501739380 +0000

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev