Merge changes from topic "libvintf_cp" am: 9bab2f5fa2 am: 0998353f08

am: 1c3670d185  -s ours

Change-Id: I17f54dfeaec13512095757fadc4a5c623be25622
This commit is contained in:
Yifan Hong 2017-08-24 20:04:52 +00:00 committed by android-build-merger
commit ec7bd8666f

Diff content is not available