tree cba62d0d64153aa2169651696bc238591341d679
parent 3f06ba7ee358e6041fc33016da86416435cec8ba
parent 7c79e5dc819b08f544a53f7f300c033280755c7f
author Adam Cohen <adamcohen@google.com> 1414085482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085482 +0000

am 7c79e5dc: am 6521be4f: am 2dc25b18: am 202e4fda: Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf

* commit '7c79e5dc819b08f544a53f7f300c033280755c7f':