OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb418db 2a2f33f)
am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE
authorSascha Haeberling <haeberling@google.com>
Mon, 7 Oct 2013 21:59:00 +0000 (14:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 21:59:00 +0000 (14:59 -0700)
* commit '2a2f33feffe61e2e7b5717aa05de718856f5bec0':
  Fix missing filtershow string. DO NOT MERGE


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