tree 04cdb98d71386c673a6b04d1e1ccf60e21423081
parent 11b61a49725c31291a17adb09b804ce5c7de4ef8
parent 87cef63ab482cc3a7f33fff4f3a079f9824856ed
author Yohann Roussel <yroussel@google.com> 1517561707 +0000
committer android-build-merger <android-build-merger@google.com> 1517561707 +0000

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

Change-Id: If96d1a6b829a67f2ecf8783b80bfe0a492508b4e