tree cba62d0d64153aa2169651696bc238591341d679
parent c3fa14e78ab0d973b3bd2646bf5ed5aad860fcfb
parent 575937508171ed19bc943615e25d45efd21cbcbf
author Adam Cohen <adamcohen@google.com> 1414085352 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085352 +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':