tree cba62d0d64153aa2169651696bc238591341d679
parent 6e16b417d33fd77f2b08012a83425085a9d25bae
parent 6a16825272cca86484d8db88b376b1a42131a8d5
author Chris Craik <ccraik@google.com> 1414085231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085231 +0000

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

* commit '6a16825272cca86484d8db88b376b1a42131a8d5':