tree 10a3ce3f8977e7159435723b27ea392a6d0bfcbf
parent 16bc5859b728d3fb74a538679920cf3846505616
parent b33ca4f38c6b2a804fda7dad4cb488134b485130
author Fred Fettinger <fred.fettinger@motorola.com> 1415048235 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415048235 +0000

am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1  -s ours

* commit 'b33ca4f38c6b2a804fda7dad4cb488134b485130':