OSDN Git Service

Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c am: 549c3fc0da
authorPaul Stewart <pstew@google.com>
Sat, 11 Feb 2017 02:52:44 +0000 (02:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 11 Feb 2017 02:52:44 +0000 (02:52 +0000)
am: bdfb1b86d3

Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68


Trivial merge