OSDN Git Service

Merge changes from topic 'fix-vts-test' into oc-dev am: a64eb7c698
authorShuo Qian <shuoq@google.com>
Thu, 18 May 2017 23:03:25 +0000 (23:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 23:03:25 +0000 (23:03 +0000)
commit618d4e7e688d57b4b5b7739333d97dfdf93293ef
treed745ac5f23278eff55351a513f92bf9c407c91e6
parent351065743711928b3b2b23314d17b7312b058c56
parent8d0e10f08d0163d5feeea0dbe6e25db05241a188
Merge changes from topic 'fix-vts-test' into oc-dev am: a64eb7c698
am: 8d0e10f08d

Change-Id: Ic2a67dc296c9f85f51925ce10e684acdb140fd6e