OSDN Git Service

Merge changes I6f00614d,I987eeab2 into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 6 Apr 2017 21:21:55 +0000 (21:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Apr 2017 21:21:59 +0000 (21:21 +0000)
* changes:
  Convert 16 bit bitmaps to 8 bit on devices that do not have GLES3.0
  Fix HardwareBitmapTests.testBitmapConfigFromRGB565


Trivial merge