tree 9eb2f8ebf6377a9be9acb17d025609b638ccf245
parent dbad075ae835981363f54b890c3a4b53abbcfb26
parent 639f24429cbc0024f7b78f32400337ac79b8c30d
author Android Build Merger (Role) <android-build-merger@google.com> 1499418270 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499418270 +0000

Merge "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 am: 013d6216a1"