OSDN Git Service

am f7ea34e6: (-s ours) am 1a37c1b0: Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 4 Apr 2013 01:10:13 +0000 (18:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Apr 2013 01:10:13 +0000 (18:10 -0700)
commitd3940362eaef083107016aaff25a1a7d03c66bea
tree45e3158206a805f87e4c481cbad83134a9a53f45
parentd7a42a7abc8111b91edc3097c9eb21c77b608cfd
parentf7ea34e6da6f361c995663ff378f490f8d3edcd5
am f7ea34e6: (-s ours) am 1a37c1b0: Reconcile with jb-mr2-release - do not merge

* commit 'f7ea34e6da6f361c995663ff378f490f8d3edcd5':
  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