tree c9ddc498941d36d981c7540c1276fb7ef549f05d
parent f754ef73a51227e055a9634d69102364b8649bd6
parent c40073c77f34d62a8d857eba7f5c04c1eaabf623
author Colin Cross <ccross@android.com> 1491446843 +0000
committer android-build-merger <android-build-merger@google.com> 1491446843 +0000

Merge "Move proguard before classes.jar" am: 41d5cd7420
am: c40073c77f

Change-Id: Ib60ca56f292d105bbd873422915d9640463610df