tree ea5bc4f7f75f1da61427f0be2ee92316bc3fe81b
parent 9bd932fdfc6784560db9a4d6ad12d3119e151b54
parent 89184b7e7fa8c186a9f95cb9fe406c718def754a
author Android Build Merger (Role) <android-build-merger@google.com> 1499417765 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499417765 +0000

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