tree 513bc4a580b02811c0f8220c9756463aa1ba2442
parent f4b688524cf906453a288c8bbc3ba4d23fb1d26b
parent 6bef14bb4c4c54728cd9da63ca33ce84a900bc22
author Adam Cohen <adamcohen@google.com> 1381794506 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381794506 -0700

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

* commit '6bef14bb4c4c54728cd9da63ca33ce84a900bc22':
  Fix issue where custom content pops in (issue 11209357)