OSDN Git Service

am 1a37c1b0: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Apr 2013 01:05:27 +0000 (18:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Apr 2013 01:05:27 +0000 (18:05 -0700)
commitf7ea34e6da6f361c995663ff378f490f8d3edcd5
tree45e3158206a805f87e4c481cbad83134a9a53f45
parent8285f913dfda1beca42612be2bd2bbfff516fa99
parent1a37c1b012e4c38cafa1c4e945cd8cd690e7e105
am 1a37c1b0: Reconcile with jb-mr2-release - do not merge

* commit '1a37c1b012e4c38cafa1c4e945cd8cd690e7e105':
  am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
  am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce