tree cba62d0d64153aa2169651696bc238591341d679
parent 3e783f6a94c2e4469ac90270f09e63cebd067b87
parent ca101c6a3bc0fa8444b369dd644790ae54e47d25
author Adam Cohen <adamcohen@google.com> 1414085325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085325 +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':