tree 63f895ca9ed20dbed62218f51c80daa96b672b60
parent 3624a0b58207792d298d1dd0a3f138b3e48a3481
parent 146d96fe2478a2a7d591f0ac6dda8493749e4db5
author Dongwon Kang <dwkang@google.com> 1510196074 +0000
committer android-build-merger <android-build-merger@google.com> 1510196074 +0000

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
am: 146d96fe24

Change-Id: I12bacf3fa15bf345bc027e3f8e0c2f22d386caf0