OSDN Git Service

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


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