tree aeb55dbd25a8879cca5ae181f045c0b46b806d4d
parent cbcc4701a6d6b5a82b083c82a19638543f67e93e
parent 21cd002fef13ff0b6336f10f97e29738a2b0ecb9
author Adam Cohen <adamcohen@google.com> 1381434866 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381434866 -0700

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

* commit '21cd002fef13ff0b6336f10f97e29738a2b0ecb9':
  Fix issue where custom content would show up on boot (issue 10713745)