Catch BAD_MATCH from createWindowSurface am: 7df6c12492 am: 7133594cbd
authorCourtney Goeltzenleuchter <courtneygo@google.com>
Wed, 13 Sep 2017 23:33:48 +0000 (23:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Sep 2017 23:33:48 +0000 (23:33 +0000)
am: 7dc8d6721b

Change-Id: I4c42c62648cbb40714df270cb598bed72300e6e4


Trivial merge