tree d407c9211be4fa2824fc06932cfa01be159f5818
parent e8c06ffbf49b3b2eb8b1b15fce485182e1c495e5
parent 65e067f32e512a3aab6d7c01a83c8dd0d3e7f750
author Remi NGUYEN VAN <reminv@google.com> 1592985869 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592985869 +0000

Merge "Jarjar com.google.protobuf" into rvc-dev am: 65e067f32e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11952738

Change-Id: I546461bbd9e498b605045743ce3108c8a7484015