tree 1bf93357e6e0382486b09f056429b62ce8b41343
parent c86bf87c17750470628c2b1064cbb55dda95f38f
parent 94c024db21d185c4a3e77ce3aacdf20457f7dd64
author Pawin Vongmasa <pawin@google.com> 1496791895 +0000
committer android-build-merger <android-build-merger@google.com> 1496791895 +0000

Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev am: c422235e9b am: f13d78e7e8
am: 94c024db21  -s ours

Change-Id: I5c025acf56f90864f575ceb6c75487a22dd5a1a1