OSDN Git Service

(root) / android-x86 / packages-apps-Gallery2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7a42a7 f7ea34e)
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)
* 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


Trivial merge
packages/apps/Gallery2
About OSDN
Find Software
Develop Software
Help