tree 8a55c5a3221bb9a128c84ba697270078eb550a0d
parent f4165c4cf7a4152a5ef34856a53f7a7757483020
parent ab6b2db8ed7432d8843e663be17e60a21a162129
author nharold <nharold@google.com> 1508184799 +0000
committer android-build-merger <android-build-merger@google.com> 1508184799 +0000

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

Change-Id: I936b30270a6e40d83469fb7cc528e94e49141c64