| commit | c0b24fdc610d27518b12a3e5ae1ec1872932d9de | [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 | 8b4c125579e235a41d28394a893a655d88681933 | |
| parent | 7145bf8ecc9f678f47016e5886e67bd2d2b673f2 [diff] | |
| parent | 07fd6c218a47ef3250d1b56b932a6877f9efacfc [diff] |
am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev * commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027': Camera2: Increase mode update timeout.