[automerger skipped] ADD new enum NetworkType to identify multiple transport...
[automerger skipped] ADD new enum NetworkType to identify multiple transport type in am: 9aec8977 am: c6e3232b am: d8cbb584 am: d3210cf2 -s ours
am skip reason: Change-Id I24ceff6bc95af79d92d3e39695b24d10763cdb4e with SHA-1 4089f1fd is in history
Change-Id: Ic77b889fc3570746762e71f40124e9a03d0849a1