commit | a3851dc8a077d325c25e00dc3fed32ed854bebb2 | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Mon Aug 25 17:10:37 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 25 17:10:37 2014 +0000 |
tree | ce0aa79bfaced06b3040c55d18b1d2be628e0017 | |
parent | 8556b22007982c44398bd80dd473c132af52025f [diff] | |
parent | f6dc6ac81e9f39dd5c439f6342893cc7cd58f303 [diff] |
Merge "Camera: vary timeout by number of results expected" into lmp-dev