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)
commita6a4a9ed46d02ec0c6493a97cd1d3351bdcced63
treee87d2d245acfa61091b73b860c811447d250134d
parent84db79bb65bce5c1fd8a6e033cb7e4db4c04f9b1
parentf6c8206735e7e078461e5f2aef6e1a1446fdd075
am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)

* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)