tree ae09df23cd862967fcd8fc7040f70f6e4b9e80c8
parent 18148ac7568faeb164c8c1162815f5285cc5d619
parent 06f85bcf9666d96fdcea39dca1e7a5dc0432c107
author Craig Donner <cdonner@google.com> 1481581633 +0000
committer android-build-merger <android-build-merger@google.com> 1481581633 +0000

Merge "Allow both RENDER and TEXTURE flags when creating native client buffers." am: 2a3edda489
am: 06f85bcf96

Change-Id: I5391ae665e5ea95ed68d96f8d06626ab455dd074