[automerger skipped] DO NOT MERGE: Use GL_LINEAR filter when drawing scaled...
[automerger skipped] DO NOT MERGE: Use GL_LINEAR filter when drawing scaled TextureView am: 93ac4012
am: dcedc99b -s ours
Change-Id: Icdb7c6d13efe4bc2a9a6fc9332f0c68e351747fa