tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 4d6ed136813ac1e39a222099778fd7b373a668fa
parent ca101c6a3bc0fa8444b369dd644790ae54e47d25
author Adam Cohen <adamcohen@google.com> 1392411575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411575 +0000

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

* commit 'ca101c6a3bc0fa8444b369dd644790ae54e47d25':