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:
61909b5
71a0e32
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: a020cc...
author
android-build-team Robot
<android-build-team-robot@google.com>
Tue, 1 May 2018 20:24:37 +0000
(13:24 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 1 May 2018 20:24:37 +0000
(13:24 -0700)
am:
71a0e324f4
-s ours
Change-Id: Ia074dd1613cb9e1f9417c926f7d26e7d4ac50926
Trivial merge