OSDN Git Service

Merge changes I689cb0c0,I09603218
authorMathias Agopian <mathias@google.com>
Thu, 4 Aug 2011 01:12:36 +0000 (18:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Aug 2011 01:12:36 +0000 (18:12 -0700)
* changes:
  Add a 'release' method to the SurfaceTexture public Java API
  Mark Window-Manager-specific APIs on android.view.Surface as @hide


Trivial merge