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:
1125f26
9da0a74
)
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
author
Bill Yi
<byi@google.com>
Fri, 7 Jul 2017 15:55:58 +0000
(15:55 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 7 Jul 2017 15:55:58 +0000
(15:55 +0000)
am:
9da0a744c5
-s ours
Change-Id: Ic856cb8ca560d42fae8f1b6499716300f39218c8
Trivial merge