commit | 4f01ae1e199e24378b5acb960b05daf955f1fc07 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Mon Dec 05 18:04:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 05 18:04:27 2016 +0000 |
tree | 6c82e2e3e2854df4072be02154cc3fce3e85787e | |
parent | 606d2f0062a98860758a71a6ff8f5a7764b6c7f7 [diff] | |
parent | e8a701f4a6a0c11dc7bae627e2deb90ef8205cc3 [diff] |
Merge "Replace the "coldboot" timeout with a property." am: e218fc673f Change-Id: Ibaf1f7ad3a90e5216db04506288df51258e19f4b