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:
ff1ed61
29f70cb
)
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am...
author
Bill Yi
<byi@google.com>
Thu, 21 Dec 2017 20:34:39 +0000
(20:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Dec 2017 20:34:39 +0000
(20:34 +0000)
am:
29f70cb6fb
-s ours
Change-Id: I3b1f978abd9a3f0511af1df8735f873695e01997
Trivial merge