OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4bc8db f2d744d)
am f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)
* commit 'f2d744d9535ca59be6cd878830176f81a0a8fbc6':
  Camera2/3: Fix deadlock when starting recording before preview.


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