tree 38630aee55d5e937b345f6c1b8f07c204c910a9b
parent a9d53c95d51c9ac566fcc6a6a234d8e82195d529
parent 8f6ccd2e014fae30b3b672623c57cbb5dc38b908
author Ivan Gavrilovic <gavra@google.com> 1506938700 +0000
committer android-build-merger <android-build-merger@google.com> 1506938700 +0000

Merge "Add shrinkedAndroid.jar to build tools" am: 1a9b850c50 am: a578e61335
am: 8f6ccd2e01

Change-Id: I58279783d9242b874d77147bc5770c204e3f62a5