tree 3fa568a937db60fe0fcc2154d35247fb6586edaa
parent c76a037bc559c49414c9e7d2c63c85399652b10b
parent 453a3787f933af1aeb62f59166f1cd8578afb3bd
author Yin-Chia Yeh <yinchiayeh@google.com> 1536871552 -0700
committer android-build-merger <android-build-merger@google.com> 1536871552 -0700

Merge "Camera: extend getBuffer wait timeout" am: a8fb86eb97
am: 453a3787f9

Change-Id: I7b535874bfef2ada0eb9fc5e0437584862c9218b