tree 7b145602016587c7ab2b0fcf8c0189d89e9e576c
parent 2d356db998754ff87ddd9ccee823d5707816561c
parent 87206b3ca2b1fe6dd6a545e4ae6091598f997015
author Tao Bao <tbao@google.com> 1492487502 +0000
committer android-build-merger <android-build-merger@google.com> 1492487502 +0000

Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5 am: 35849591a0  -s ours
am: 87206b3ca2

Change-Id: I486a89ed3c2a9f778fa25cfa13d413718363f488