tree 10da860fcff71886af91d082e31f0e1917926848
parent d7d29c66a249e9d0fe893771ee4590f85a8a426e
parent be978777f2b89fd996eecc1784a61a17cb625a8a
author Chris Craik <ccraik@google.com> 1414566117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566117 +0000

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

* commit 'be978777f2b89fd996eecc1784a61a17cb625a8a':