tree 6025eeb000d333120ed432928836701605ada94a
parent 991f9479566519de0c0641bf6e074764151d427d
parent 62fb821faff578b9fe0353f12e2c731cccf22437
author Dan Willemsen <dwillemsen@google.com> 1490149610 +0000
committer android-build-merger <android-build-merger@google.com> 1490149610 +0000

Merge "Speed up non-AB ota_from_target_files in the build system" am: 47ba4239c8 am: 02e29c5b48
am: 62fb821faf

Change-Id: Idb3a0c991efe712865db7343861212a74ea56b0a