tree f62b9d68e2c16849ca44adc789ae92a6aa2c9327
parent abdfb8bafd80ac2cbf28510adc3ea3a609339550
parent 5e6af54a09568f5297160f9fe6de1112354e365c
author Pawin Vongmasa <pawin@google.com> 1496792132 +0000
committer android-build-merger <android-build-merger@google.com> 1496792132 +0000

Merge "Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev am: c422235e9b am: f13d78e7e8 am: 94c024db21 am: 4ffff4e45f  -s ours" into oc-dev-plus-aosp
am: 5e6af54a09

Change-Id: Id9e0c8f330d1a0cd48c6654f66d5ad54f39ca5c4