tree a1b4e9a781b3dce5cd5b4a5093cada5f18824f99
parent af95bc25b2727bcbda69b48afeff5ff020c9095d
parent 46ad41f56a99aac2bc2c2497f0b109b870cfc7d8
author Christoffer Quist Adamsen <christofferqa@google.com> 1532677974 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1532677974 +0000

Merge "Preparation for -adaptresourcefilecontents support"