| commit | 2f1b1b87c94ea0075ccd4d0369f25676a1e8878a | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Nov 11 20:50:51 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 11 20:50:51 2013 -0800 |
| tree | 1f085336f91e3792e5801aff3f343c1233ea09c4 | |
| parent | 9c6415d2e4c77db4fb605a0df289d9a64d6587f0 [diff] | |
| parent | c247759b5646bfaa40bd874e04c010e6960984e8 [diff] |
am c247759b: (-s ours) am 09fac4c2: am 0d95f5db: Merge "Camera: fix wait for preview done timeout issue. DO NOT MERGE." into klp-dev * commit 'c247759b5646bfaa40bd874e04c010e6960984e8': Camera: fix wait for preview done timeout issue. DO NOT MERGE.