tree 513bc4a580b02811c0f8220c9756463aa1ba2442
parent 3eb3b27a58c958aab0b284683d9858e742287efe
parent 2456b9738803b5f4314b6747dd7eea116d03eb3d
author Adam Cohen <adamcohen@google.com> 1381794342 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381794342 -0700

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

* commit '2456b9738803b5f4314b6747dd7eea116d03eb3d':
  Fix issue where custom content pops in (issue 11209357)