tree c79ba9971941d916d7bd232ed02497fb4d9db3a3
parent d873e9b5fc3bd25c55199ac7d109a80d7f54251c
parent 82dcbf060d505079930f576b0c442fe72f3316e8
author Android Build Merger (Role) <android-build-merger@google.com> 1496802783 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496802784 +0000

Merge "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: ad69388455  -s ours" into oc-dev-plus-aosp