tree 8f6a1427ab18a44b1bb94119705cf169891837c6
parent 905157ef4d56266d52496cec237e348624901de4
parent 0b38a9447a6e146132922ab18862b96534f3e968
author Adam Cohen <adamcohen@google.com> 1392411232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411232 +0000

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

* commit '0b38a9447a6e146132922ab18862b96534f3e968':
  Fix issue where custom content would be invisible (issue 11644432)