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:
508f816
8f1ccc8
)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f -s ours...
author
Bill Yi
<byi@google.com>
Tue, 27 Jun 2017 20:26:30 +0000
(20:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 27 Jun 2017 20:26:30 +0000
(20:26 +0000)
am:
8f1ccc824c
-s ours
Change-Id: Ic7140d196944adf7a925f3120de66aa3bb18457a
Trivial merge