OSDN Git Service

Merge "Fix Vts errors" am: 570b0cbf6a am: 243e4dd831
authorShuo Qian <shuoq@google.com>
Fri, 28 Apr 2017 00:02:09 +0000 (00:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 00:02:09 +0000 (00:02 +0000)
am: 4ee27ea19c

Change-Id: Ied38732abfa645dcdc5c1f55c56836ec2b8f4cbe


Trivial merge