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:
df51217
3d9c7cb
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
author
Bill Yi
<byi@google.com>
Wed, 5 Jun 2019 01:09:12 +0000
(18:09 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 5 Jun 2019 01:09:12 +0000
(18:09 -0700)
am:
3d9c7cb356
-s ours
am skip reason: subject contains skip directive
Change-Id: Id4ebeff5c481ede8d583bd59e4eabd1d3a7dcbe1
Trivial merge