OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 951d7b3 2c1bc46)
am e50ba28a: am 9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Sat, 20 Oct 2012 00:21:46 +0000 (17:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 20 Oct 2012 00:21:46 +0000 (17:21 -0700)
* commit 'e50ba28aa1846a7c2a296f122a5675476dacc4a5':
  Camera2: Fix potential deadlock


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