OSDN Git Service

Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev
authorRoshan Pius <rpius@google.com>
Thu, 15 Mar 2018 02:39:21 +0000 (02:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Mar 2018 02:39:21 +0000 (02:39 +0000)
am: dbeb6bc3f1

Change-Id: Ib9b32466ea217703592f304d5b133d547a83f822


Trivial merge