OSDN Git Service

Merge "Fix vts tests:" into oc-dev am: 14b34e19d6
authorShuo Qian <shuoq@google.com>
Mon, 12 Jun 2017 04:50:56 +0000 (04:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 04:50:56 +0000 (04:50 +0000)
commite23461320505a825bf17d79d95bba18855c36521
treea4bf86a14fa1eab172e43f91369620d45645cf19
parentf94412793315cdd469323b01d8a1d96ffb5433a1
parent01cb1ff6d7c092aea8d3033e091af10c56bbc686
Merge "Fix vts tests:" into oc-dev am: 14b34e19d6
am: 01cb1ff6d7  -s ours

Change-Id: Ib321ca514a53d0c038affbd0ee5757eb5cee5dbb