tree cba62d0d64153aa2169651696bc238591341d679
parent 218dbc0952bdeb37a09278413bbb4a228fc21254
parent 0765fc4d8b5ed1b23f1cda10137cb3ae99e41928
author Adam Cohen <adamcohen@google.com> 1414085479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085479 +0000

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

* commit '0765fc4d8b5ed1b23f1cda10137cb3ae99e41928':