OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8711cc8 845dade)
am 845dadec: (-s ours) Reconcile with klp-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 22:14:38 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Aug 2013 22:14:38 +0000 (15:14 -0700)
* commit '845dadec2a2cc619d316c44e706b15eba4d75293':
  Add back DisableCameraReceiver


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