[automerger skipped] Merge "Make user explicitly set security type for tether network" into pi-dev am: 0e721c598e

am: 13f97a29a6  -s ours

Change-Id: I7f160e545d458ce3257379d54c46157158ea7633
This commit is contained in:
Salvador Martinez
2018-05-18 20:32:49 -07:00
committed by android-build-merger

Diff Content Not Available