tree 86aba0e877058ae78b9b753c0f53f385fcb52072
parent 32757b93e023bfe21099064f4d5e74ddc25e9382
parent 956e8424052d19d88315d17982f03a90ed80e06b
author Nick Kralevich <nnk@google.com> 1538108232 -0700
committer android-build-merger <android-build-merger@google.com> 1538108232 -0700

Merge "Add system_file_type" am: d14b18d80e
am: 956e842405

Change-Id: I15ab70cd9db254b9d60fa7f176e1443f3902638c