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:
9b79a4c
f78ed70
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb1...
author
Bill Yi
<byi@google.com>
Fri, 31 May 2019 00:47:52 +0000
(17:47 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 31 May 2019 00:47:52 +0000
(17:47 -0700)
am:
f78ed7078e
-s ours
am skip reason: subject contains skip directive
Change-Id: I02e30980ecd606b9e18dfe1f61af71e0c01706fa
Trivial merge