tree c79ba9971941d916d7bd232ed02497fb4d9db3a3
parent d22ce9faae5aac6147e99aadc11c83d8eb24a2e1
parent 436f03aa2e7237d2273cb2ac078c935bb0626ff4
author Pawin Vongmasa <pawin@google.com> 1496802746 +0000
committer android-build-merger <android-build-merger@google.com> 1496802746 +0000

Merge "Check the buffer index from acquireBuffer" into mnc-dev am: ec2549aa62 am: adfbbe1684 am: 11b3066c06 am: 5f0883c02a  -s ours am: 68d565932f  -s ours am: e38b2ed078  -s ours am: ead6ac4da1  -s ours am: 1d7447ecb7  -s ours am: c434840227  -s ours
am: 436f03aa2e  -s ours

Change-Id: I7881603dc3b64bc2ebc3002fa5893d8ce40d20ee