tree a760e6e00c5ed5b5dff14dc56703273b6a3612a2
parent ecc5f8c011cf4f2ca34b8e0b73b3b398440ff948
parent 069cba02c161987a28a7151c5587106ec9951c38
author Logan Chien <loganchien@google.com> 1487699931 +0000
committer android-build-merger <android-build-merger@google.com> 1487699931 +0000

Merge changes from topic 'vndk-def-tool' am: c5a534236e am: c55813a336
am: 069cba02c1

Change-Id: Idf49ee65b5e2408ce48a2c9652e1a6d7b7c24ec9