resolve merge conflicts of bf8899d41 to oc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Fri, 21 Apr 2017 00:29:55 +0000 (17:29 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 21 Apr 2017 00:29:55 +0000 (17:29 -0700)
commit59febde93580b338f51c23a7f036195e10efa8c6
tree732ed09e1af1a0e39e103c0fbe2550e7205aec71
parent24e713de1ba9cb965cd4028ab036f44c8781e251
parentbf8899d41f1916122d7bd6b19fd44ebed30e42ae
resolve merge conflicts of bf8899d41 to oc-dev-plus-aosp

Change-Id: I05d0a671554b7455b9773a670080fd04f419360d
android/cts/master/vk-master.txt
scripts/build_android_mustpass.py