OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79531fc 0d3abc8)
am 0d3abc89: (-s ours) am 8ca32464: am 6cad9e09: am 36c21ca1: Merge "Check both the...
authorErin Dahlgren <edahlgren@google.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:45 +0000 (18:14 +0000)
* commit '0d3abc895a7b2606edee71f8321cdc47fd601666':


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