tree e76261c48eceeaac55331c95e766dbd9d6f9faf1
parent 02dd85c6abb0ce1518d39b83dae37ed74b761112
parent a8c1906a9d318f428d2022b7d732c0c7e029a96d
author Chris Craik <ccraik@google.com> 1380718763 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380718763 -0700

am a8c1906a: Merge "Disable hardware layer on custom screen" into jb-ub-now-indigo-rose

* commit 'a8c1906a9d318f428d2022b7d732c0c7e029a96d':
  Disable hardware layer on custom screen