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:
1412b5d
b1b04dd
)
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours
author
Bill Yi
<byi@google.com>
Sat, 22 Jul 2017 16:45:20 +0000
(16:45 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 22 Jul 2017 16:45:20 +0000
(16:45 +0000)
am:
b1b04dddef
-s ours
Change-Id: I52cfd424753db44826ff7b81cdbb85ffd4358152
Trivial merge