tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent dd5f0e7cc4bb6ff40e91568fbda0861f278bbeca
parent 95c925ae5eb205221f44e522d59902ed97e32479
author Adam Cohen <adamcohen@google.com> 1392411132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411132 +0000

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 '95c925ae5eb205221f44e522d59902ed97e32479':