OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 103c5b0 e0279d3)
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 15 Jun 2012 00:09:01 +0000 (17:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Jun 2012 00:09:01 +0000 (17:09 -0700)
* commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0':
  Gallery2: Check privative effects


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