tree 9eb2f8ebf6377a9be9acb17d025609b638ccf245
parent d7dc72ba3a08026d116e707a9ad8caf79cd46c97
parent 09ee0ec17ad185aab1225301fe504ee4763fd506
author Logan Chien <loganchien@google.com> 1499418207 +0000
committer android-build-merger <android-build-merger@google.com> 1499418207 +0000

Merge "vndk-def: Use os.path.join() instead of '/'" am: 683e59ce11 am: 6a0b93ed7c am: 9bd932fdfc
am: 09ee0ec17a

Change-Id: Iea154e5c30ff701d87d2dbd201f49c61cc38aa41