OSDN Git Service

Merge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d5512
authorEtan Cohen <etancohen@google.com>
Thu, 23 Mar 2017 00:29:04 +0000 (00:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Mar 2017 00:29:04 +0000 (00:29 +0000)
commit9a46e190521f3887fea6c1e03c220187e160298f
treeeec48bf083e01672085f837fd996124b52b2a8ea
parent79e9afe244b0561f6b4600ed8dffe2ea002e5b90
parentadedd72dd1fc4c5fd25c6eb6622ca574129c9210
Merge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d5512
am: adedd72dd1

Change-Id: I8e7a62ca48e6925bf39157d5459ac0d46038a100