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:
509d7bb
f224aa6
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped...
author
Antony Sargent
<asargent@google.com>
Thu, 8 Mar 2018 19:48:36 +0000
(19:48 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 8 Mar 2018 19:48:36 +0000
(19:48 +0000)
am:
f224aa6af9
-s ours
Change-Id: I0441b99e9f7b945d41303fdc8d0e412426a081e3
Trivial merge