tree 04864744d49eddce54603ae764959447cc5bd47f
parent 1a3a5b0c67c0ed596efe56a9df9477a983dccc39
parent 2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a
author Adam Cohen <adamcohen@google.com> 1392410275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410275 +0000

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

* commit '2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a':
  Fix for transparent CustomContent screen (issue 11549096)