tree 7c04ea27fcc6f1dc54e09b94b5ea5d6576bee1eb
parent 539e1bab4dc3553fa6503654f36df9b3659752d1
parent 549c3fc0da92a7ad4bace45765558695d49625bb
author Paul Stewart <pstew@google.com> 1486781311 +0000
committer android-build-merger <android-build-merger@google.com> 1486781311 +0000

Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c
am: 549c3fc0da

Change-Id: I35592cd0e25bf459505c0a2008b7fe1f3be6298c