tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent fba5ecd8e265e099830560d3edf2d6e38437fab1
parent 9126060222e199dd38c9d25b33f785bf0feace97
author Adam Cohen <adamcohen@google.com> 1392410216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410216 +0000

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

* commit '9126060222e199dd38c9d25b33f785bf0feace97':