tree 90e2a994c35fc691f9992996286fcdbb659c999c
parent 72a2a99a1d63dca4153d920fc2852b5ffe7caccf
parent a505ce94d3eb435c322b1d2c5efb39dc63381ab8
author Remi NGUYEN VAN <reminv@google.com> 1588231100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588231100 +0000

[automerger skipped] Merge "Address comments on NetworkStack AIDL v6" into rvc-dev am: 675ec9d30e -s ours am: b1bcc4e053 -s ours am: e4dac8419c -s ours am: a505ce94d3 -s ours

am skip reason: Change-Id Id9b71784e5f6294d203230e57737979e063ff0f8 with SHA-1 a530ebb62d is in history

Change-Id: Id0f460a8c682a0edbd6a87c7fa6a37499384a4de