tree 0d1c5d3e0bc749054b6d17533b55280f98c103a3
parent a1ec9893b8fd2aa0e499261323d9fe7ad115d915
parent 89fca351702e3ec54c2748e2e2676ec1b2fbe9dc
author Romain Guy <romainguy@google.com> 1295938401 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295938401 -0800

am 89fca351: Merge "Make nested hardware layers work again" into honeycomb

* commit '89fca351702e3ec54c2748e2e2676ec1b2fbe9dc':
  Make nested hardware layers work again