OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfaf4ad 82d2091)
am 82d2091c: (-s ours) am d094939d: am e0c413ca: am 4ab4879e: Don\'t show the option...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
* commit '82d2091c5d6796cd461eb8d0748f338872760040':


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