| commit | 09fac4c200d6cc463089e18ba9b2797b171b947d | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Nov 11 09:50:31 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 11 09:50:31 2013 -0800 |
| tree | f3d5010f69bb6c5399a4d17cf97104bdc8a5a765 | |
| parent | 1794ec16e7378456e0ad8fd1ef9c50824eda4388 [diff] | |
| parent | 0d95f5db56446ddccf3a43607f30d2d374e642e4 [diff] |
am 0d95f5db: Merge "Camera: fix wait for preview done timeout issue. DO NOT MERGE." into klp-dev * commit '0d95f5db56446ddccf3a43607f30d2d374e642e4': Camera: fix wait for preview done timeout issue. DO NOT MERGE.