OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 494c02a 5dce0fe)
am 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO...
authorSascha Haeberling <haeberling@google.com>
Mon, 7 Oct 2013 22:12:21 +0000 (15:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 22:12:21 +0000 (15:12 -0700)
* commit '5dce0feec3d6345062c4ce8de5426bc23f04b572':
  Fix missing filtershow string. DO NOT MERGE


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