OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f596762
469a4ce
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 299491...
author
Bill Yi
<byi@google.com>
Mon, 2 Apr 2018 21:16:11 +0000
(21:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 2 Apr 2018 21:16:11 +0000
(21:16 +0000)
am:
469a4ce1d2
-s ours
Change-Id: Idbe486c3bd6a2b60299b8a988124b73fd3d5dd6a
Trivial merge