tree 1f156c614e81cffe06d665c259cddb599a48b75e
parent 80e1efd80bca86846d7108c30b3225dd20a087f7
parent 69de214290d254616b33b117196ba67f67857051
author Lucas Lin <lucaslin@google.com> 1571202566 -0700
committer android-build-merger <android-build-merger@google.com> 1571202566 -0700

Merge "Remove the network capabilities which are added twice" am: 931234b451 am: 4c90111d11 am: eb9542bdd7
am: 69de214290

Change-Id: I4868e49b461a0e1990827acdcdd29279b988bd34