tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent f9c25c3768beb2421d6ba839136a1075bae3517a
parent 19e3742930ac35703c46cf8bab5f73bf9b6b86a3
author Adam Cohen <adamcohen@google.com> 1392410196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410196 +0000

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

* commit '19e3742930ac35703c46cf8bab5f73bf9b6b86a3':