tree 723c5c56d21893c30f372ba2ca569bc5e18613df
parent 9228c914d22259cb7fac5e075581cfb79175b19e
parent cdf6b4202c501113699f948c1612c2f4b1f534b9
author Treehugger Robot <treehugger-gerrit@google.com> 1593404200 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593404200 +0000

Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a