tree d172cb204fe8084e07c9e61a6b928ef4f5862dce
parent 6a611d9731467b03f39d3c4ae26b090c723db429
parent 64bf462eb9732050305c1a41c71e41960a0113b2
author Fernando Lugo <flugo@google.com> 1490398513 +0000
committer android-build-merger <android-build-merger@google.com> 1490398513 +0000

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

Change-Id: Idab5bef714d80651e3402fb370e811310f5bbb35