tree 10da860fcff71886af91d082e31f0e1917926848
parent 638c46e144974fbdafb5fd3568de50594146e397
parent 2b7de18804b3ff5bc954a3bf7e33a3ced96b29fd
author Adam Cohen <adamcohen@google.com> 1414566361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566361 +0000

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

* commit '2b7de18804b3ff5bc954a3bf7e33a3ced96b29fd':