tree 2e233239d024648b773e949f04d2c748b468a671
parent 2cc2544024364ec532a6d49131cb842fe9b559ae
parent c7331d02d1c6b1e51b3a1210506f38fd61819495
author Elliott Hughes <enh@google.com> 1431634471 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1431634472 +0000

Merge "Reduce the coldboot timeout to 1s."