OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce48e21 53f0fa4)
am 53f0fa40: am b07da381: am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE...
authorScott Main <smain@google.com>
Mon, 5 Nov 2012 23:42:53 +0000 (15:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:42:53 +0000 (15:42 -0800)
* commit '53f0fa4017f99f9ad9a539074c67003734ef0752':


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