tree 1c4900d798817ecdf6af7bc0e11f12c0083bd2a7
parent 4b4475308598659137657261218fc5a3207ec79c
parent 331cf2fb7c16b5b25064f8d2f00284105a9b413f
author Elliott Hughes <enh@google.com> 1480960825 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1480960825 +0000

Merge "Replace the "coldboot" timeout with a property."