tree 0ad748c243950af46add0af5dbe60a5d8d7159e6
parent 0300247758cf1965867128c79d94e0b2c38a69aa
parent aa4545b5aedae165c8d2db0009dcdfa18e4f7923
author Doug Zongker <dougz@google.com> 1395333093 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395333093 +0000

am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"

* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
  restore minui support for paletted images with < 8 bits