tree d06da83c33abb6a3ecd9550a3a65617d72df15a5
parent 0f8ba811a5663824d76d35a04381b4fde882497d
parent 85dd2d7d6ed5d5d8c150af63128cd50856363cce
author Tao Bao <tbao@google.com> 1567194998 -0700
committer android-build-merger <android-build-merger@google.com> 1567194998 -0700

Merge "releasetools: img_from_target_files uses zip2zip." am: f833a75283 am: bce0264348 am: 4c29efc4e7
am: 85dd2d7d6e

Change-Id: Icec5eab1ba79e5d69285be0b610d5c47e9ce8956