am 2965afd0: resolved conflicts for merge of 50c6217e to master
authorColin Cross <ccross@android.com>
Fri, 24 Jul 2015 05:18:05 +0000 (05:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jul 2015 05:18:05 +0000 (05:18 +0000)
commitacd534bc46dd819f1a79affc8f61ca8c2376e958
tree2880901fdb6881d74672ea4a95b3f3db687de231
parentb5649ada1ee7f146512a063a1162365081ac04f5
parent2965afd058727d55347fdab1f93e849cce9e9f8e
am 2965afd0: resolved conflicts for merge of 50c6217e to master

* commit '2965afd058727d55347fdab1f93e849cce9e9f8e':
  Remove broken fbo completeness cases from mustpass