am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"

* commit '03af2bf6c3a8c81836b572098c3e0be3dc7fc778':
  DO NOT MERGE libgui: Plumb attach/detach through Surface
This commit is contained in:
Dan Stoza 2015-04-03 16:29:54 +00:00 committed by Android Git Automerger
commit 6941090eb6

Diff Content Not Available