tree 99fff600ed4b6a16977f72fafc80236652bbac7a
parent 06e98369b3db1d5d93d582d4d5b49c9d2a3ae455
parent 20f5734962687681012cc2aa79fb63526a9608b3
author TreeHugger Robot <treehugger-gerrit@google.com> 1503669602 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1503669602 +0000

Merge "Camera: Handle RESULT_ERROR followed by BUFFER_ERROR" into oc-mr1-dev