tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 2fc65860016c1de6c9652855f4a365b5e027c22c
parent d75f95adb5d3b4275bbd7698e5c5224a34ec412a
author Chris Craik <ccraik@google.com> 1392410139 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410139 +0000

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

* commit 'd75f95adb5d3b4275bbd7698e5c5224a34ec412a':