tree 7f8bf275c3c271927a4c49ac72d0b4b34da15b7c
parent b27a039b9c5db7ce33a5ee220b8b3fc7435cd21e
parent 35849591a0e351d76c6efd98152440226041ce96
author Tao Bao <tbao@google.com> 1492487171 +0000
committer android-build-merger <android-build-merger@google.com> 1492487171 +0000

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

Change-Id: Ifc15ea6b3b293740073061f99702200c744fdbb9