tree ea5bc4f7f75f1da61427f0be2ee92316bc3fe81b
parent 0675e1f524d97f2758956d8916363903d04c98dc
parent 6a0b93ed7c0ab66e6990861adc6b5e15666b23c0
author Logan Chien <loganchien@google.com> 1499417755 +0000
committer android-build-merger <android-build-merger@google.com> 1499417755 +0000

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

Change-Id: I49824cb03eabfdd397df44df9cb938d2e617364c