tree 3ba5a2d94b347b8c975b625725cf2660a3dd9443
parent 7eeb25c5fd9b7f04d7afd1d7d28d516048dbeb7a
parent 89ec00b6221f39aec1bcfb72f66c8f5a6c56db59
author Hall Liu <hallliu@google.com> 1537918753 -0700
committer android-build-merger <android-build-merger@google.com> 1537918753 -0700

Merge "Add intdef for Telephony network type constants" am: 544b8efa46
am: 89ec00b622

Change-Id: I95d0f9f62b4b9597cef50b1d8a9e23df09831720