tree fca56e7e18211765df70337c1428462c8106372b
parent aa8307b991b9fca5403b5d7f43659b92527af4fd
parent 52800617946c456e78ed010c82d0ec4358368164
author Mathias Agopian <mathias@google.com> 1360966111 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1360966120 +0000

Merge changes I5a218ca1,I853a76d9

* changes:
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split