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:
ca35ed5
242c3c4
)
Merge "Import translations. DO NOT MERGE" into oc-dev
author
Bill Yi
<byi@google.com>
Thu, 22 Jun 2017 13:35:55 +0000
(13:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Jun 2017 13:35:55 +0000
(13:35 +0000)
am:
242c3c497c
-s ours
Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6
Trivial merge