tree 17db8a209458a051d90e3cc6cbecb5611e988f7f
parent 30dfaeaae7b19592bcdd924787bbc3aebc61226f
parent 5489f3c69ac35b4a6a0e6762d47cfc50bb8a79ed
author Pawin Vongmasa <pawin@google.com> 1496813839 +0000
committer android-build-merger <android-build-merger@google.com> 1496813839 +0000

Merge "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 am: 57c05dd9fb  -s ours am: 5e128aa3d3  -s ours am: cf3434f441  -s ours am: 5e67f37232  -s ours" into oc-dev-plus-aosp
am: 5489f3c69a  -s ours

Change-Id: I0251ee6ab1066fc756a76ccc037d6db3e166e73e