OSDN Git Service

am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
authorMathias Agopian <mathias@google.com>
Tue, 7 Jun 2011 21:58:02 +0000 (14:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 21:58:02 +0000 (14:58 -0700)
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)


Trivial merge