| commit | c28d5d24c98f50daa9fa31a8afaca6d6c50283cd | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Sep 18 18:04:00 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 18 18:04:00 2012 -0700 |
| tree | 6d8b2be02ef95ee91f60b0f391f95a405560c2ab | |
| parent | 0e004bd92d88540ead11f0b4728b7c0a0a11169c [diff] | |
| parent | 74e58c55bc5259b957a51f1bb44a5911ad1f8400 [diff] |
am 74e58c55: Merge "Camera2: Increase capture timeout." into jb-mr1-dev * commit '74e58c55bc5259b957a51f1bb44a5911ad1f8400': Camera2: Increase capture timeout.