tree e169d24b1bf1151e8e95e8499e5c5c0b3acc037a
parent 9336d62dcfb668771ea5b3e1497c471da008ae10
parent 7edf405cddbea3d2684dba9d7872e248fb14ddfa
author nharold <nharold@google.com> 1508179935 +0000
committer android-build-merger <android-build-merger@google.com> 1508179935 +0000

Merge "Remove getNetworkType() from ServiceState" am: ce1f9afb84
am: 7edf405cdd

Change-Id: I0782f2db112fb1c0e404dc01e9a401268523ad39