OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff2294b cf087b4)
am cf087b41: (-s ours) am 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:38 +0000 (18:14 +0000)
* commit 'cf087b416532547626ec193b920757d5095ce0ac':


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