OSDN Git Service

Merge changes from topic 'libvintf_cp' am: 9bd4c20764 am: 7fbbc2e85d
authorYifan Hong <elsk@google.com>
Sat, 6 May 2017 00:42:05 +0000 (00:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 6 May 2017 00:42:05 +0000 (00:42 +0000)
am: 31175a97b4  -s ours

Change-Id: I4dc312132d8c91e46de6fec7b944a8e42086577b


Trivial merge