tree 1f9ca7a14f8dc68e13a5cfc2e348bb1567eb90f2
parent 5649a3df9423843cc86fa430f2d63a7d28ccd6fa
parent 4ee27ea19c178581ae128edde0a1b8dda680c900
author Shuo Qian <shuoq@google.com> 1493337729 +0000
committer android-build-merger <android-build-merger@google.com> 1493337729 +0000

Merge "Fix Vts errors" am: 570b0cbf6a am: 243e4dd831
am: 4ee27ea19c

Change-Id: Ied38732abfa645dcdc5c1f55c56836ec2b8f4cbe