OSDN Git Service

am ad8d0e65: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 18:04:16 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Apr 2013 18:04:16 +0000 (11:04 -0700)
commit046a48291b75fb4915f39199534c5ea3f87e86df
treebba8b673be5b2dd2be289f4021f01c3567ea8a7a
parentfff9f80d5d437c3fc5fabcd9ba60bed36bec07c1
parent04f495b436521cf1182c4e9c4cb496d9ab9dddf3
am ad8d0e65: Reconcile with jb-mr2-release - do not merge

* commit 'ad8d0e6512b89af0310f454e7f16b710fef16e96':
  am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
  am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
  am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
  Make camera releasing synchronous.