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

Change-Id: I254d5fb840314948133c7c74b607492ea3abc333


Trivial merge