resolve merge conflicts of 59febde93 to master
authorPyry Haulos <phaulos@google.com>
Fri, 21 Apr 2017 00:40:36 +0000 (17:40 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 21 Apr 2017 00:40:36 +0000 (17:40 -0700)
commitd26c27202e2ce985d86e4ce5ed6a7fc02d35e574
tree99504ff8585add0d498846b298f6220de3f32069
parent1c299a3403c64395ac3d12328d170d52fd8f02c2
parent59febde93580b338f51c23a7f036195e10efa8c6
resolve merge conflicts of 59febde93 to master

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