tree 10da860fcff71886af91d082e31f0e1917926848
parent c3c4a112d4501920947bbf067331ba819e762d98
parent 85d6ba4d6a3e04f9d7313719d3658bcfeca1b616
author Adam Cohen <adamcohen@google.com> 1414566246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566246 +0000

am 85d6ba4d: am ca101c6a: am 7838ff6c: am 19e37429: am 3bfe1b38: am 21cd002f: Fix issue where custom content would show up on boot (issue 10713745)

* commit '85d6ba4d6a3e04f9d7313719d3658bcfeca1b616':