tree acc76fa1809c638c6ed661448d3529f24938ca8f
parent 0e8ea03ea3ef64770c6be3f0f8feec064e3ad258
parent f36fee3cf764838aa8b1f59142e82049e4cbacb1
author Nathan Harold <nharold@google.com> 1558382133 -0700
committer android-build-merger <android-build-merger@google.com> 1558382133 -0700

[automerger skipped] Use the SubId in the TM.getNetworkType if Valid
am: f36fee3cf7 -s ours
am skip reason: change_id Ice4f673750ab3b374644750113e5b9b2a4f5ba63 with SHA1 0aca431313 is in history

Change-Id: I88de75bde31a644ace9d727eceaf9c764bf689a0