OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2381033 2cad801)
am 2cad801d: (-s ours) am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger...
authorMathias Agopian <mathias@google.com>
Fri, 17 May 2013 20:55:28 +0000 (13:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 May 2013 20:55:28 +0000 (13:55 -0700)
* commit '2cad801d0d05190cf4ab7edc7ecffc5862ee18dd':
  [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock


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