OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4318086 e6e00e7)
am e6e00e74: (-s ours) am 5eaa6237: am b439aa31: am 4de78806: Revert CL that added...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:41 +0000 (18:14 +0000)
* commit 'e6e00e74536115db5707c9c0488f1f8c891f3d34':


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