| commit | a4ae0b974e580b759e82d861d137cea6f91a304d | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Sep 18 18:16:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 18 18:16:20 2012 -0700 |
| tree | 32b81d29fc684926891239b1d75a6538dbf3c5b4 | |
| parent | 9f6b07ec93877d22c69bb07706fa54abe2f76c71 [diff] | |
| parent | 7c3a0edf7e01c4bac07dcfcb2443ed4afc8c679c [diff] |
am c28d5d24: am 74e58c55: Merge "Camera2: Increase capture timeout." into jb-mr1-dev * commit 'c28d5d24c98f50daa9fa31a8afaca6d6c50283cd': Camera2: Increase capture timeout.