OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4554d9f b83e363)
am b83e3632: am f38cb998: Fix conflict with other build fix
authorMichael Jurka <mikejurka@google.com>
Mon, 5 Nov 2012 23:49:53 +0000 (15:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:49:53 +0000 (15:49 -0800)
* commit 'b83e3632acf59c2e790f6d22f7830891db44852b':


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