OSDN Git Service

Merge changes Ib302d79e,Ib4ee085f
authorJamie Gennis <jgennis@google.com>
Tue, 27 Sep 2011 21:24:09 +0000 (14:24 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Sep 2011 21:24:09 +0000 (14:24 -0700)
commited984d9406b5a4062db93319e6f94d5f9fd19648
tree0a69cd7b2adf3d3bf670e877beb366f7d0e390b4
parent26f1ba4af022adc1fb0f910dec9f3fc0ce171197
parenta249f2d11249ff37c48119020b797ad437ddef2c
Merge changes Ib302d79e,Ib4ee085f

* changes:
  SurfaceFlinger: set layer names on SurfaceTextures
  SurfaceTexture: add name support
services/surfaceflinger/Layer.cpp
services/surfaceflinger/LayerBase.h