tree 5fdf591e3639785e8199a557e17213cbb22d07ef
parent 8de47a2f25a9379c44f220f0bd0f25585bfbc9fb
author Mathias Agopian <mathias@google.com> 1307483542 -0700
committer Mathias Agopian <mathias@google.com> 1307483542 -0700

fix a surface leak introduced by a failed merge (DO NOT MERGE)

Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c