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:
dc75d02
94cd0e4
)
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours
author
songkailun
<songkailun@xiaomi.com>
Wed, 22 Nov 2017 18:57:13 +0000
(18:57 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 22 Nov 2017 18:57:13 +0000
(18:57 +0000)
am:
94cd0e4373
Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd
Trivial merge