tree 55560698187c4e13b447888990cd71841a2b55b2
parent d759bae733716089becf7a4c53d295e8eb6e32a1
parent 9bd932fdfc6784560db9a4d6ad12d3119e151b54
author Logan Chien <loganchien@google.com> 1499417995 +0000
committer android-build-merger <android-build-merger@google.com> 1499417995 +0000

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

Change-Id: I8253c01f44bf30bf66ac3c7cc5805931a45e4f00