tree 04cdb98d71386c673a6b04d1e1ccf60e21423081
parent 67bed50c99eafc86a75e8f25778c9b7534820828
parent 970a20d7497d347677a20c52e6454194c6b4c45f
author Yohann Roussel <yroussel@google.com> 1517541851 +0000
committer android-build-merger <android-build-merger@google.com> 1517541851 +0000

Merge "Build shrinkedAndroid.jar from SDK 20 API" am: 6e979de7e8
am: 970a20d749

Change-Id: I6575a89f57cfb3ad44d2bb890fde200ba988af0c