Merge changes from topic 'libvintf' am: c1ca21a32d am: beb1cb1df5

am: 35849591a0  -s ours

Change-Id: Ifc15ea6b3b293740073061f99702200c744fdbb9
This commit is contained in:
Tao Bao 2017-04-18 03:46:11 +00:00 committed by android-build-merger
commit 87206b3ca2

Diff content is not available