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