tree 1cc8967443372ea839d69eb19b1e2762cd237414
parent f5e60b1e798d15fc466f5f15a4db6920e4d0c2d1
parent 83c1a98f774cc4e4e1546aaaba2fa13820f05b40
author Eino-Ville Talvala <etalvala@google.com> 1472155353 +0000
committer android-build-merger <android-build-merger@google.com> 1472155353 +0000

Merge "Camera3: don't let dequeueBuffer block indefinitely" am: bbf70c5122 am: 3c2423173d
am: 83c1a98f77  -s ours

Change-Id: I56d4a0b571bdeaa6f59a2f22105612378c279646