OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10ec344 49bcaaf)
am 49bcaafb: resolved conflicts for merge of c0dd3adf to lmp-dev-plus-aosp
authorNeil Fuller <nfuller@google.com>
Mon, 27 Oct 2014 05:36:45 +0000 (05:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 05:36:45 +0000 (05:36 +0000)
* commit '49bcaafb0ac92b2a2ae6b35deb640714b2a02bd9':


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