tree 6f2934ba5f87a7f4520f90105de5c876c025a8f5
parent a9f8aeeb0706d991a2b3bff6c99941143fafaa42
parent 4e2683a4b582d28bb320308b5e5f3541ae1aa310
author Adam Cohen <adamcohen@google.com> 1384539719 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384539719 -0800

am 4e2683a4: Merge "Fix issue where custom content would be invisible (issue 11644432)" into jb-ub-now-jolly-elf

* commit '4e2683a4b582d28bb320308b5e5f3541ae1aa310':
  Fix issue where custom content would be invisible (issue 11644432)