tree 71cca5090003ca0b46a97cbc43b52e94103376bd
parent d68fec8751eb7090e9c4ceccd37cf7b50edf6c6d
parent 29ebc18900ce51b3d2e558f684d0600d9865b6a0
author Hadrien Zalek <hzalek@google.com> 1595880448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595880448 +0000

Merge "Add a build module for the Netty Shaded library" am: 9297fc3b14 am: 29ebc18900

Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/1371536

Change-Id: I0bf724b741d84c5c249f9a68827e59bff7f07ecb