tree aeb55dbd25a8879cca5ae181f045c0b46b806d4d
parent e454ebe2e5fdbaf0f0b978aa30c0e672df894536
parent 3bfe1b38973103c105ead34345f8d30e6c3660db
author Adam Cohen <adamcohen@google.com> 1381435003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381435003 -0700

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

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