tree 77d2390573c8b017bd3a08bea8986291e73e4c08
parent 3b443dc51efa8180b26ceb0f9851c10a70649d9f
parent 609bc02b21c725825bd469391e9ecd4e2d462fe1
author Eddy Talvala <etalvala@google.com> 1332949843 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332949843 -0700

Merge "camera: prevent possible deadlock scenario"