Merge "Fix a few null driver bugs" into vulkan
authorPyry Haulos <phaulos@google.com>
Tue, 24 Nov 2015 21:19:04 +0000 (21:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 Nov 2015 21:19:04 +0000 (21:19 +0000)

Trivial merge