| commit | 7d2f7c0745f98b8db11bcf073fca8bc079bffee0 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 24 20:19:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 20:19:02 2015 +0000 |
| tree | 75a013868f50d52c07f3057077f180cf059307b5 | |
| parent | 49fe9d6b295775b7ca744999b1252414f1cec52a [diff] | |
| parent | 2edaa98ec028bbd19c75ebb2214779c8ca149106 [diff] |
am 2edaa98e: am bb426427: am d77d1e41: am 436a2749: Merge "Camera: further relax legacy capture latency timeout" into lollipop-mr1-cts-dev * commit '2edaa98ec028bbd19c75ebb2214779c8ca149106': Camera: further relax legacy capture latency timeout