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:
cf2557e
ec4fe2a
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
author
Bill Yi
<byi@google.com>
Thu, 30 Nov 2017 23:01:17 +0000
(23:01 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 30 Nov 2017 23:01:17 +0000
(23:01 +0000)
am:
ec4fe2a0c6
-s ours
Change-Id: I8979949845d4722a448047f31beb6fa11ff60434
Trivial merge