OSDN Git Service

(root) / android-x86 / frameworks-av.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51b7125 47ef192)
am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 7 Mar 2014 02:18:42 +0000 (02:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 02:18:42 +0000 (02:18 +0000)
commit40659dea8eefaa9d7f5b742e3333d68b6f0dd89c
tree53a621f8f1b314c07c0ffff156c25b3981813ab0tree | snapshot
parent51b7125bd0e2127f1d57938e95523dcc61e657efcommit | diff
parent47ef192f0296642b901e82d0c72c5a1a0d08f4dfcommit | diff
am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev

* commit '47ef192f0296642b901e82d0c72c5a1a0d08f4df':
  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