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