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)
am: adedd72dd1

Change-Id: I8e7a62ca48e6925bf39157d5459ac0d46038a100


Trivial merge