OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfc2606 a11111f)
am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 7 Mar 2014 02:00:59 +0000 (02:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 02:00:59 +0000 (02:00 +0000)
* commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e':
  DO NOT MERGE: Camera: fix focusArea wrong indexing issue
  DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
  DO NOT MERGE: camera2/3: Add protection for still capture path


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