OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12f446a f6c64f1)
am f6c64f1d: am 71ae986c: resolved conflicts for merge of dcea7639 to ub-camera-glacier
authorSascha Haeberling <haeberling@google.com>
Fri, 15 May 2015 17:17:36 +0000 (17:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:17:36 +0000 (17:17 +0000)
* commit 'f6c64f1de59e6cf62403b9649c743996f1662a86':


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