tree ae10f327a447ffda166eef4dbb33dcb815d46ae7
parent b8ac6093b283b6c7879828757eccd0255f282f3b
parent b616ea40686c279690a6a4093c7a68f20a7dd15d
author Tom Cherry <tomcherry@google.com> 1506020025 +0000
committer android-build-merger <android-build-merger@google.com> 1506020025 +0000

Merge "Revert "Remove comments and code about ro.boot.slot"" am: eb00b1f3aa am: 0ff5f16f7b am: aea4f28852
am: b616ea4068

Change-Id: Ibefaa1ca219900ffe1b5d1287151ed40d3afa4ab