tree f801dacc6035522f30f23a5b080fe8ca34034ea9
parent 1e17ea6c515ddf9ab73023b29e876572a5d3077d
parent 1774f07f6ecb2601e5318a326b8d614a96871b74
author Aaron Holden <aaronholden@google.com> 1503964777 +0000
committer android-build-merger <android-build-merger@google.com> 1503964777 +0000

Merge "DO NOT MERGE Improve DynamicConfig file copying" into nougat-mr1-cts-dev
am: 1774f07f6e  -s ours

Change-Id: Iae25069fec5eb0cf61dfc37a704138e818e77dea