| commit | d9001d27332e2fe450a67416a0f5482d169d60c4 | [log] [tgz] |
|---|---|---|
| author | Nan Zhang <nanzhang@google.com> | Wed Sep 20 19:53:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 20 19:53:47 2017 +0000 |
| tree | c52a31bf0f72fdfb38b5fde338160d04b558a680 | |
| parent | 279df08f3b5c2360e286cc426448d97f42b7307b [diff] | |
| parent | 39bbfe217a62fc37e98faca2f8ec2e178cc309fd [diff] |
Merge "Use merge_zips to merge jars during Java build in Make." am: 39bbfe217a Change-Id: Iad7343ad4d2889fc39161e8ab14449f42d23008b