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:
5d74b7d
f66ddc0
)
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
author
Bill Yi
<byi@google.com>
Wed, 26 Jul 2017 23:09:07 +0000
(23:09 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 26 Jul 2017 23:09:07 +0000
(23:09 +0000)
am:
f66ddc099a
-s ours
Change-Id: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd
Trivial merge