am 6c34b22e: Merge "Add new texture formats and remove 2 problematic formats"
authorPyry Haulos <phaulos@google.com>
Fri, 16 Oct 2015 22:29:09 +0000 (22:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Oct 2015 22:29:09 +0000 (22:29 +0000)
commit6f6e1b4181d7055a359b2e57c2da512f19540e14
tree83ba4d9bd33e857d0ef8bffc269da02ab1c85f6e
parentac10b5e1b2ede1e78c9f755ced7ba5006967a730
parent6c34b22e61ea80f1f9e168c50c43465b2cbf9bfe
am 6c34b22e: Merge "Add new texture formats and remove 2 problematic formats"

* commit '6c34b22e61ea80f1f9e168c50c43465b2cbf9bfe':
  Add new texture formats and remove 2 problematic formats