Merge "Add support for UNORM_SHORT_1555 format; fix bugs"
authorPyry Haulos <phaulos@google.com>
Thu, 3 Dec 2015 18:33:37 +0000 (18:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Dec 2015 18:33:37 +0000 (18:33 +0000)
am: afd8128a69

* commit 'afd8128a69cc390a7e7c5f227e0720b0e0e064f9':
  Add support for UNORM_SHORT_1555 format; fix bugs


Trivial merge