OSDN Git Service

[automerger skipped] Merge "Make user explicitly set security type for tether network...
authorSalvador Martinez <dehboxturtle@google.com>
Sat, 19 May 2018 03:32:49 +0000 (20:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 19 May 2018 03:32:49 +0000 (20:32 -0700)
am: 13f97a29a6  -s ours

Change-Id: I7f160e545d458ce3257379d54c46157158ea7633


Trivial merge