am 1d538214: am 369aafb6: am eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours
automerge: 0ce56ec -s ours
* commit '0ce56ec4ccb830bbe5d815a6b80161bf163bf04f':
This commit is contained in: