tree 55560698187c4e13b447888990cd71841a2b55b2
parent 3e954bd70b3e066c456e43bd41b42ffb71c27937
parent 9a8fd5a57a1a507710e03cb08724f80d1c287c3e
author Android Build Merger (Role) <android-build-merger@google.com> 1499418021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499418021 +0000

Merge "Merge "Merge "vndk-def: Use os.path.join() instead of '/'" am: 683e59ce11 am: 6a0b93ed7c" into oc-dev-plus-aosp am: ed5e10d53b" into oc-dr1-dev-plus-aosp