tree e81a23b784168276aa440308e670c33833464d80
parent 68d565932fbd4fdf136dd905cc85dffec1099e54
parent e4f5cdce47653cb08b48edc57675018d62b8de86
author Pawin Vongmasa <pawin@google.com> 1496812750 +0000
committer android-build-merger <android-build-merger@google.com> 1496812750 +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

Change-Id: Iddbea1d12cecd6fabcb14410f89d3e2ac20cfc43