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:
0b8e969
5265373
)
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
author
Bill Yi
<byi@google.com>
Wed, 21 Jun 2017 20:08:35 +0000
(20:08 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 21 Jun 2017 20:08:35 +0000
(20:08 +0000)
am:
52653734e3
-s ours
Change-Id: I7bb9c57df7c7723d48bd12432567ee97ba9295d8
Trivial merge