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:
8c71d38
b76c1ba
)
[automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController...
author
Fan Zhang
<zhfan@google.com>
Fri, 11 May 2018 06:04:02 +0000
(23:04 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 May 2018 06:04:02 +0000
(23:04 -0700)
am:
b76c1ba682
-s ours
Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31
Trivial merge