OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad381c3 13b37b8)
am c8c39b6c: (-s ours) am a6a4a9ed: am f6c82067: fix a surface leak introduced by...
authorMathias Agopian <mathias@google.com>
Thu, 9 Jun 2011 00:32:30 +0000 (17:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 00:32:30 +0000 (17:32 -0700)
* commit 'c8c39b6c5b14bbe17fbd0ffe4f3524f68a0caa10':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)


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