OSDN Git Service

am 6dbfc87d: am 32d4b6c8: Merge "SurfaceFlinger: Limit to 4k Layers"
authorDan Stoza <stoza@google.com>
Thu, 30 Apr 2015 22:28:54 +0000 (22:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 22:28:54 +0000 (22:28 +0000)
commitf7a862a1d6f103519d41c2c0d4aef8aa4289ac3f
tree61d93b74388a9f3f9d9a1c1d2ed331219ab2253a
parent036bdf3832351346c091a0c85fdb54795a159ef5
parent6dbfc87da5b07547b7ce7a0218fef3a90d23a6c4
am 6dbfc87d: am 32d4b6c8: Merge "SurfaceFlinger: Limit to 4k Layers"

* commit '6dbfc87da5b07547b7ce7a0218fef3a90d23a6c4':
  SurfaceFlinger: Limit to 4k Layers
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger.h