| commit | 146d96fe2478a2a7d591f0ac6dda8493749e4db5 | [log] [tgz] |
|---|---|---|
| author | Dongwon Kang <dwkang@google.com> | Thu Nov 09 02:51:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 09 02:51:06 2017 +0000 |
| tree | d6523d537e03fc62f28b4be6accc099e3e170c9e | |
| parent | d8ec820e750ccbf4d9f757ec99c0bf6ca138e03d [diff] | |
| parent | 20086d7001b468d04e2f6319eb4a87e24f912875 [diff] |
Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842 am: 4c7a2e2667 am: df5ad2fecf am: 20086d7001 Change-Id: I2a6684aaf478e200a96a90928ac90287994456e2