Merge "Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a am: db45dfc398...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 27 May 2016 14:40:30 +0000 (14:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 14:40:30 +0000 (14:40 +0000)
commit0f76157c3be15a2e7cdce0227b2a13730bca76b3
tree2500c2c1945c2c90f870dae97677f38f6b2819e0
parent9a6dd53af23e1f166d719b3a23521e4e21d5d0f3
parent9ec71cb6a7e368ba816ee2f65e800eb20d32c973
Merge "Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a am: db45dfc398" into nyc-mr1-dev-plus-aosp