tree a80f5acb86b0bc8cc7db916d883b34f3dd3ad2a5
parent c76ea3d727638acb94b84e4f88f7487d869a5f39
parent 4e61df625802514fc68cb98c7f5639aeed0dee2f
author Mark Lu <marklu@google.com> 1473291345 +0000
committer android-build-merger <android-build-merger@google.com> 1473291345 +0000

Merge "docs: fix grammar mistake in TextureView" into nyc-dev am: 2b05f12911
am: 4e61df6258

Change-Id: Ieebfbd7e527e7d396398076075741f28df7d3ad3