OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f05aec2 6c72c18)
am 6c72c187: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 18:11:53 +0000 (11:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Jun 2013 18:11:53 +0000 (11:11 -0700)
* commit '6c72c1877fadca5068fa94f7a0249c0609e85534':
  camera2/3: Fix deadlock take picture while preview callback
  camera3: Fix crash in set error state.
  camera2/3: Add protection to callback processing call


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