tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent f9bb322d4c16ce8dca35cead33add9a98dd43aa2
parent 575937508171ed19bc943615e25d45efd21cbcbf
author Adam Cohen <adamcohen@google.com> 1392411600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411600 +0000

am 57593750: am 95c925ae: am 91260602: am 6bef14bb: am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose

* commit '575937508171ed19bc943615e25d45efd21cbcbf':