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)
commit516d60932505d5a2154742b690303788bd977d23
tree3b8e6e52f2e0d2d1ed65c0f641cb6986856fb2ae
parent2f763953b9827946165ef5760a916c2f4efbe21e
parentafd8128a69cc390a7e7c5f227e0720b0e0e064f9
Merge "Add support for UNORM_SHORT_1555 format; fix bugs"
am: afd8128a69

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