tree ce278143ea4dc4950efc33def4a978a0ac59153d
parent 47aa9766c425a42c9b316a63e41e43ac12209275
parent 1e370e6ce4c320727841b8246e3ad335dcafe54b
author Sami Tolvanen <samitolvanen@google.com> 1425079887 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425079887 +0000

am 1e370e6c: am 7e1e0791: Merge "Add a program to display a slideshow at early boot"

* commit '1e370e6ce4c320727841b8246e3ad335dcafe54b':
  Add a program to display a slideshow at early boot