tree 4461068720b8aa05f81de89312ad845e86a9d8ac
parent e3a7d65ad2362b16fbec56e6690caf92f6c168fe
parent 99de249cf59adbe30be359c9e902c4cf96f237bc
author Tom Cherry <tomcherry@google.com> 1506384962 +0000
committer android-build-merger <android-build-merger@google.com> 1506384962 +0000

Merge "Reland "Remove comments and code about ro.boot.slot"" am: dea5e081ac am: 9bc2a967cf am: 687cb99e96
am: 99de249cf5

Change-Id: I989b0db7107ae47d5facbb6b5ca3905aed077161