tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 4688d0a8a09cea52abb80bc86fa360adbb793b79
parent 7ed97a0c83782532199242809813f61ea0d51144
author Chris Craik <ccraik@google.com> 1392411020 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411020 +0000

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

* commit '7ed97a0c83782532199242809813f61ea0d51144':