OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d37d4e a11111f)
am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 7 Mar 2014 18:31:19 +0000 (18:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 18:31:19 +0000 (18:31 +0000)
commit6a7b53008ac0831431f42c620d2988c65b21d859
treed48189392e641c2f38b595ea170943e8b8f70c76tree | snapshot
parent7d37d4eca3867773cf5cbb81533af0462be8a60fcommit | diff
parenta11111f9135c98cf4247bbd1a61d7df3053e549ecommit | diff
am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev

* 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
services/camera/libcameraservice/api1/Camera2Client.cpp diff1 | diff2 | blob | history
frameworks/av
About OSDN
Find Software
Develop Software
Help