tree 5613a854e9c75d7c2a01302efe808bba0b371e8e
parent 003f35d0d5e5ef621bf97197e32f6ecd2bd2c0ce
parent ed7923be4fd26b1cc1d109e40bbfbe8320eadcda
author Tao Bao <tbao@google.com> 1561683525 -0700
committer android-build-merger <android-build-merger@google.com> 1561683525 -0700

Merge "releasetools: Make additional modules Python 3 compatible." am: e4f07795e4
am: ed7923be4f

Change-Id: Idf708c33684e7c7b96286b363d15bf947422323d