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
|
compact
(merge:
9d865d0
3c19043
)
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
author
Fan Zhang
<zhfan@google.com>
Fri, 3 Nov 2017 00:31:01 +0000
(
00:31
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Nov 2017 00:31:01 +0000
(
00:31
+0000)
am:
3c19043e9c
-s ours
Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
Trivial merge