OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a63499a 0ff263c)
am 0ff263c5: am 11065123: am 7f34a6a5: Merge "Fix application of FX to not wipe out...
authorJohn Hoford <hoford@google.com>
Fri, 12 Oct 2012 00:10:29 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Oct 2012 00:10:29 +0000 (17:10 -0700)
* commit '0ff263c54b34df4cb418d12b35e31adab8444fc3':
  Fix application of FX to not wipe out borders etc.


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