tree 7cde5609834b009447afefa9172459bcc94e07ee
parent c11e670a4209b05e1d05646cc81dd67bebd7693b
parent 7e1e079174f9c78e954d15c086acdbfba8d73e83
author Sami Tolvanen <samitolvanen@google.com> 1425079155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425079155 +0000

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

* commit '7e1e079174f9c78e954d15c086acdbfba8d73e83':
  Add a program to display a slideshow at early boot