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)
commit942f55b63e2192bc8849d30c8e657e87a9ac1835
treedda23262c8fedd883abb187f369fea84b746c67d
parente02532bb6e4d2e416451916c2593bc2b5f228cfe
parent97a9884edcc6fbb311386ecfcd6e3045437f0df0
Merge changes I689cb0c0,I09603218

* changes:
  Add a 'release' method to the SurfaceTexture public Java API
  Mark Window-Manager-specific APIs on android.view.Surface as @hide