tree 85e04be2218904b298aa67c2bcc800ad76ccb828
parent 558f136a9b08164825e03daedffe7588e8d47573
parent f773cb3c694a9f5138fd536e8e8d9889f530de39
author Colin Cross <ccross@android.com> 1524188306 -0700
committer android-build-merger <android-build-merger@google.com> 1524188306 -0700

Merge "Fix echo when copying package-res.apk" am: f4b893165d
am: f773cb3c69

Change-Id: Ibc043fc14e265757d556d47d4553e56c5e5c77ed