OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e841fd
fddccf0
)
Merge "Set device credential's Window flag to be SECURE." into oc-dev am: e3d0bbcc80...
author
Fan Zhang
<zhfan@google.com>
Tue, 31 Oct 2017 19:08:16 +0000
(19:08 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 31 Oct 2017 19:08:16 +0000
(19:08 +0000)
am:
fddccf0838
-s ours
Change-Id: I2a7a57a4b63b5ed34e65801f27582f26b3eb1baf
Trivial merge