OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b455f0d
eff6f4f
)
Merge "[AWARE] Add data-path security configuration (PMK)"
author
Etan Cohen
<etancohen@google.com>
Wed, 1 Mar 2017 17:45:42 +0000
(17:45 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 1 Mar 2017 17:45:42 +0000
(17:45 +0000)
am:
eff6f4fc43
Change-Id: I90b6324a903b6307c084c891d7eba75957e13886
Trivial merge