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