| commit | e2097a5a3ea4e11b6dfa53a67ae6c101faeadcdb | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Oct 23 10:38:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 23 10:38:09 2012 -0700 |
| tree | 94dfb9278a39641ee7bfe98bf4a0e88ba38a4e58 | |
| parent | 9710001a79a914c7d1cffbaca362de12cd84c820 [diff] | |
| parent | 9e83f44c0b310a72a080c006ebc3c07bdccc7027 [diff] |
am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev * commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027': Camera2: Increase mode update timeout.