tree 90842d242f4b5a4dc2ede91b74742fc61ebde5f5
parent 7f1c756f1acc1abeeded79e396b19d4605ba5ad2
parent fcd193c9fd4c5d799d2038bded924ba57fa1e4e1
author James Dong <jdong@google.com> 1276190078 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276190078 -0700

Merge "Remove the lock/unlock workaround from CameraService" into kraken