tree 66dc85041ea9a70eb9e2c45f69e6c97ba64c300e
parent 993655b8bf75d950f2584db43e3c55161fc80520
parent 6128d7f30d3bac301acd996eeada1369844c03fe
author Luis Hector Chavez <lhchavez@google.com> 1519749399 +0000
committer android-build-merger <android-build-merger@google.com> 1519749399 +0000

Merge "Make mksquashfs generate a fs_config-friendly root entry" am: 3d4fb4e335
am: 6128d7f30d

Change-Id: I43a62ea7c4d6acb5adadfc488b94e05024499320