tree eb6c5fe38871044eb4e86f1f85bc01105dd70011
parent 4cb85b58657f485596ea0ece7ace4d1a4ee64443
parent 6e3ae4e849dc8ed68fba8531d499199a749ecf6c
author Tao Bao <tbao@google.com> 1562645993 -0700
committer android-build-merger <android-build-merger@google.com> 1562645993 -0700

Merge "releasetools: Make merge_target_files and its test Python 3 compatible."
am: 6e3ae4e849

Change-Id: I0ee3f8801e194f140f32a4123100aa0e4f449a70