tree d8d3d844dbf7bf5ade3235b7112ae5c17df00949
parent b1ed7e19837ba60b70e8f98e44f83dcf372552fa
parent 2fa3eec0e1807f6a45b71a41624698e8cc949026
author John Reck <jreck@google.com> 1438721635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438721635 +0000

am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"

* commit '2fa3eec0e1807f6a45b71a41624698e8cc949026':
  hwui: add extension to support unpack operations in OpenGL ES 2.0