OSDN Git Service

am 39b63c73: (-s ours) am ad8d0e65: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Apr 2013 18:07:58 +0000 (11:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Apr 2013 18:07:58 +0000 (11:07 -0700)
commitec5ed48620f487f9a40284a7e8dbdd8640fa857d
treebba8b673be5b2dd2be289f4021f01c3567ea8a7a
parent14980e706d9cbf5a73f5b124b0f39a25699ccfd2
parent39b63c736f2eaa5546bc65ded09b5fed1dcdfa17
am 39b63c73: (-s ours) am ad8d0e65: Reconcile with jb-mr2-release - do not merge

* commit '39b63c736f2eaa5546bc65ded09b5fed1dcdfa17':
  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.