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:
fa4d94f
14b975a
)
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
author
Bill Yi
<byi@google.com>
Wed, 6 Sep 2017 19:28:48 +0000
(19:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 6 Sep 2017 19:28:48 +0000
(19:28 +0000)
am:
14b975a42d
-s ours
Change-Id: I8217d0c9f7ca6493177fd5560f00af2c44a3a4e2
Trivial merge