OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7639f78 fcfa4c9)
am 6416f7d2: am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode...
authorIgor Murashkin <iam@google.com>
Tue, 19 Aug 2014 18:59:35 +0000 (18:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Aug 2014 18:59:35 +0000 (18:59 +0000)
* commit '6416f7d221b462542f5df0128201b1da6b206933':
  camera2: (Legacy) Add control.sceneMode = DISABLED to templates


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help