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:
160c301
f99a4a3
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
author
Bill Yi
<byi@google.com>
Mon, 16 Apr 2018 22:14:49 +0000
(15:14 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 16 Apr 2018 22:14:49 +0000
(15:14 -0700)
am:
f99a4a3e06
-s ours
Change-Id: Iea1d0a1bc534e1a50349782ab856013176a7ca66
Trivial merge