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:
ded6d15
2619c76
)
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
author
Bill Yi
<byi@google.com>
Tue, 27 Jun 2017 20:11:39 +0000
(20:11 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 27 Jun 2017 20:11:39 +0000
(20:11 +0000)
am:
2619c76cb1
-s ours
Change-Id: Ibcb59e3ae4e87301aa97fd7f7f3e93c64a2ef0f3
Trivial merge