tree 7118ed278756cb9316460b5b5520d9cb9626ef31
parent 1aca70a5361857bb41ea1e1af0859ca60cf1dbd6
parent 202e4fdafb5e4e94dd925905c1553bd92e61985e
author Adam Cohen <adamcohen@google.com> 1384539724 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384539724 -0800

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

* commit '202e4fdafb5e4e94dd925905c1553bd92e61985e':
  Fix for transparent CustomContent screen (issue 11549096)