| commit | 07fd6c218a47ef3250d1b56b932a6877f9efacfc | [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 | 73ad450b4a129dd37a30b6cbb85f5e14c8171a1c | |
| parent | daf303371262e8b57af51113f3908d3c0cc6d18d [diff] | |
| parent | 77d5554b5a18351993414c277b9f41c3710e6803 [diff] |
am 6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev * commit '6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc': Camera2: Increase mode update timeout.