Merge "DO NOT MERGE: Temporarily disable failing deqp tests" into oc-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 13 Apr 2017 06:53:20 +0000 (06:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 06:53:20 +0000 (06:53 +0000)
am: 4695739815

Change-Id: I9072733e2736c66004baf7511da447996f798683


Trivial merge