tree 926ac2344ce0e8880b6e6526b81710f32a564e01
parent 603414d5f73906de998a71fd6d33aaa5baa55fe0
parent fd9ed407e0986dabd2c74958462d466fec14446b
author Yin-Chia Yeh <yinchiayeh@google.com> 1536872305 -0700
committer android-build-merger <android-build-merger@google.com> 1536872305 -0700

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

Change-Id: I0409acec970e4d2a94c596ef9f888e43029897aa