| commit | 8df387b38fac89f2ceb6b794036170c40e6e89bc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Dec 05 18:10:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 05 18:10:27 2016 +0000 |
| tree | b0309c2df03dd682c127c6ccb68a4acbc165b70e | |
| parent | 31d61a29394380c9b3be3fb520098367dfba73d2 [diff] | |
| parent | e073020ae2a6e6467e3df49b8d52e9f497c0e83f [diff] |
Merge "Replace the "coldboot" timeout with a property." am: e218fc673f am: 8cf9d66486 am: 2bbaea9e7b Change-Id: I6d42c98f328a6fa76703b809c5676b307c125209