Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5 -s ours

am: 6cdd5f9002  -s ours

Change-Id: I3e307c755a38bfea3146f05c97f12eccc6f7658c
This commit is contained in:
Sandeep Patil 2017-11-13 16:41:11 +00:00 committed by android-build-merger
commit bee3639ab1

Diff content is not available