OSDN Git Service

Merge "Fix vts tests:" into oc-dev
authorShuo Qian <shuoq@google.com>
Mon, 12 Jun 2017 04:48:26 +0000 (04:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 04:48:26 +0000 (04:48 +0000)
commit7a5dad06bfcbb9929ae616b52a5f7f9e896d82e1
treec14d7710f25ac3d86975a85b9b27999c5d20c135
parent8ee9a9f01e8fd78a2a907a4ed5a70af7b82ec415
parent14b34e19d6b57a9b54f6e7098abbd503944dd71a
Merge "Fix vts tests:" into oc-dev
am: 14b34e19d6  -s ours

Change-Id: I20b62dd5c93feb863ddfcb042aa55ff7020dccf0