tree e76261c48eceeaac55331c95e766dbd9d6f9faf1
parent 1ab462c3bf00acd7f6100bbe47a7a012314845b8
parent 2ef571da1e4c71f0c39b73b17f12f5bf80629899
author Chris Craik <ccraik@google.com> 1380722311 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380722311 -0700

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

* commit '2ef571da1e4c71f0c39b73b17f12f5bf80629899':
  Disable hardware layer on custom screen