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)
commitc273784c91fa938586eda2a91b7268e431e838d5
treec29e34466667d76074f86e223ec5fd30e5891a16
parent43fed9afe41ee5cf7bc208f37f373d7061b5be19
parent89de234c721244fe9063971ca33839392b66387f
Merge changes I6f00614d,I987eeab2 into oc-dev

* changes:
  Convert 16 bit bitmaps to 8 bit on devices that do not have GLES3.0
  Fix HardwareBitmapTests.testBitmapConfigFromRGB565