tree 5fc702bc628f72c9f938bdc7717a638aff37e86c
parent 9990911b48de57dfc1cbe0eff283aa4b66f4500b
parent 4869968cdc247a0af05cbe6d1800aa110369ec73
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1551751779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1551751779 +0000

Merge "Merge "Fix isActiveNetworkMetered for VPNs." am: 92c55f03c6 am: 32e02764a1 am: a4084c87e8"