tree d172cb204fe8084e07c9e61a6b928ef4f5862dce
parent 36699d3fb2d279d3b3448ae1c989469b347bd2be
parent 0fc8a4b36383ee61f2cc06a7d075d17a5ab367f0
author Fernando Lugo <flugo@google.com> 1490398398 +0000
committer android-build-merger <android-build-merger@google.com> 1490398398 +0000

Merge "fs_mgr: update to new androidboot.slot param"
am: 0fc8a4b363

Change-Id: Idf923e6f6766eee6448cc57c3165930ad7fcb510