OSDN Git Service

Merge changes from topics "fscrypt-options", "fstab-options"
authorPaul Crowley <paulcrowley@google.com>
Tue, 29 Oct 2019 02:23:05 +0000 (19:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Oct 2019 02:23:05 +0000 (19:23 -0700)
am: c17827b095

Change-Id: I9a992f0da7b5199b40ce650c2eb20258cab2b562


Trivial merge