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:
1171eb2
23269a9
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am...
author
Bill Yi
<byi@google.com>
Wed, 11 Sep 2019 18:49:11 +0000
(11:49 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Sep 2019 18:49:11 +0000
(11:49 -0700)
am:
23269a9dce
-s ours
am skip reason: subject contains skip directive
Change-Id: Iebe020f2fea82262686de76856e5cc9d670e5454
Trivial merge