OSDN Git Service

Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev
authorEino-Ville Talvala <etalvala@google.com>
Tue, 29 May 2012 20:39:41 +0000 (13:39 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 May 2012 20:39:41 +0000 (13:39 -0700)

Trivial merge