tree 45a95755dea69ea49863d1ba94f83ab8d36ba230
parent ead6ac4da14aa3dd6bfee1ad2498be00b8a7dd72
parent f105e6ad23192e429cc670b5ae8c69714ea3d107
author Pawin Vongmasa <pawin@google.com> 1496813051 +0000
committer android-build-merger <android-build-merger@google.com> 1496813051 +0000

Merge "Check the buffer index from acquireBuffer" into klp-dev am: d050902155 am: 668b7f4b8f am: 54f81e8fe7 am: 8cb7994cbf am: fa0b15cf8f am: d158da44d5  -s ours am: eb7c508001  -s ours am: 8342e031ba  -s ours am: 26151c1ac2  -s ours am: e4f5cdce47  -s ours am: 8b6cd3c1c6  -s ours
am: f105e6ad23  -s ours

Change-Id: I71bca654ca12ff67a2854dd081affbce39e6c7c5