[automerger skipped] ADD new enum NetworkType to identify multiple transport type am: 1c8b991615 am: 704b463d17 am: fb976d3117 am: 8ab37dcb59 -s ours am: 4a3f2576da -s ours
am skip reason: Change-Id I0d106ca1631265b872386b59d542b206614f38ef with SHA-1 0bdce42a78 is in history
Change-Id: I7a2bcf094c75734a571e151fc061f835790da437
This commit is contained in: