tree 8135d2003a008cc1f4a8cc738f65c91f9bf09f3e
parent 53ebd571d8bf10025c73145ff92df90528ef33e8
parent 146d6d340fefb18a9dda3fb5e3874a2c05f7b6b4
author Florian Mayer <fmayer@google.com> 1522333599 +0000
committer android-build-merger <android-build-merger@google.com> 1522333599 +0000

Merge "Use FileScanner to build static map." am: de030d6f8c
am: 146d6d340f

Change-Id: I035ebf88ea3b9f19bcb3de4815cf522f3432593d