OSDN Git Service

am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture."
authorTim Murray <timmurray@google.com>
Mon, 3 Feb 2014 22:44:39 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Feb 2014 22:44:39 +0000 (22:44 +0000)
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.


Trivial merge