OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd4d020 e1fc04b)
am e1fc04ba: (-s ours) am ee011517: am c74825b1: Merge "Allow user to tap on lock...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:34 +0000 (18:14 +0000)
* commit 'e1fc04babedcb425e8e9c329d18b833846225a37':


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