tree 10da860fcff71886af91d082e31f0e1917926848
parent 3649f44552f6629d6dd136c6486fb0d6af48132a
parent 31e68c7e692c53be8925036ca6b671c64c516700
author Adam Cohen <adamcohen@google.com> 1414566358 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566358 +0000

am 31e68c7e: 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 '31e68c7e692c53be8925036ca6b671c64c516700':