tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 9e5a3b0e2a0a82c7bd67724fc5f732083cc26c37
parent 7838ff6c455cea0fdab8dda4b7cb95cb462f9dd9
author Adam Cohen <adamcohen@google.com> 1392411101 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411101 +0000

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

* commit '7838ff6c455cea0fdab8dda4b7cb95cb462f9dd9':