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:
243eaaf
f376fc4
)
Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into...
author
Raff Tsai
<rafftsai@google.com>
Wed, 5 Jun 2019 09:47:05 +0000
(
02:47
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 5 Jun 2019 09:47:05 +0000
(
02:47
-0700)
am:
f376fc4ecc
-s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e
is in history
Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1
Trivial merge