OSDN Git Service
(root)
/
android-x86
/
hardware-libhardware_legacy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e58fbf0
9a46e19
)
Merge "[AWARE]: Add support to accept either passphrase or pmk" am: ad6f1d5512 am...
author
Etan Cohen
<etancohen@google.com>
Thu, 23 Mar 2017 00:31:07 +0000
(
00:31
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 23 Mar 2017 00:31:07 +0000
(
00:31
+0000)
am:
9a46e19052
Change-Id: I136dd9be16b2c187d86ab4a6b16db486f7084123
Trivial merge