tree 3ffef32cefa4f82f2462373c8881ebb8c6122476
parent 6bfd0a508fcd077ba1331f6224882a6c6f6237ab
parent 9d8c21fba6af4e63f8eac22251579a536cca48dd
author Nathan Harold <nharold@google.com> 1558993166 -0700
committer android-build-merger <android-build-merger@google.com> 1558993166 -0700

Merge "Deprecate getNetworkType" am: d47ae01063 am: 40ae3d6281
am: 9d8c21fba6

Change-Id: I44afb003967de980aef74d40334c4876d8988c75