OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 997afb2 1c950cc)
am 1c950cc2: (-s ours) am 2be61f66: am dfca664a: am 831da613: Merge "Set camera contr...
authorErin Dahlgren <edahlgren@google.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:49 +0000 (18:14 +0000)
* commit '1c950cc26a213c08715ee7a7d9fa7265826277bb':


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