| commit | e073020ae2a6e6467e3df49b8d52e9f497c0e83f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Dec 05 18:07:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 05 18:07:57 2016 +0000 |
| tree | b0309c2df03dd682c127c6ccb68a4acbc165b70e | |
| parent | 55162e270d0bd6dd84bc9533051b4a427e1075a0 [diff] | |
| parent | 4f01ae1e199e24378b5acb960b05daf955f1fc07 [diff] |
Merge "Replace the "coldboot" timeout with a property." am: e218fc673f am: 8cf9d66486 Change-Id: Ia389e04f3e3be92eef6f22494b21345991b7c4f2