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)
commit39b63c736f2eaa5546bc65ded09b5fed1dcdfa17
treebba8b673be5b2dd2be289f4021f01c3567ea8a7a
parent3476f21c3510e4d2184f3275ba7e1c6ffed0f1b1
parentad8d0e6512b89af0310f454e7f16b710fef16e96
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.