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:
7f054fe
8b8bf4c
)
[automerger skipped] Merge "Schematize Crypto state system property" am: 6c38df5eff...
author
Kiyoung Kim
<kiyoungkim@google.com>
Wed, 13 Mar 2019 05:31:41 +0000
(22:31 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 13 Mar 2019 05:31:41 +0000
(22:31 -0700)
am:
8b8bf4c39e
-s ours
am skip reason: change_id I957a8e37a88f7bb6d5007a36c02952d3539580fe with SHA1
4d7bd6d85e
is in history
Change-Id: I4df0425e2b933347ad52ec50f67db55428be5185
Trivial merge