tree 72f5d1ad0ad0c46b7632825382d410ff7d79de15
parent e8aa7dcf191faa9e746e36d7e3b459af2fd95e6c
parent ff165e31fd60beeccbd7c9c78a05a4c7c59c9b1d
author Daniel Norman <danielnorman@google.com> 1563547287 -0700
committer android-build-merger <android-build-merger@google.com> 1563547287 -0700

Merge "Clean up merge_target_files.py."
am: ff165e31fd

Change-Id: I4bb6e084b0beb4a57df38a9e083b7e4900320a63