tree 53e892d3f2edca97bcce8d9b77b749a347b9c974
parent 1124a1bd01f3a7014e7a7cfdee4428dc3e6a5b6b
parent 41d5cd742084a62409887c15259e292333b8fed9
author Colin Cross <ccross@android.com> 1491446663 +0000
committer android-build-merger <android-build-merger@google.com> 1491446663 +0000

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

Change-Id: I65fe576155f9375d4f05f598b62032af1d3e6695