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

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