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:
8819941
7729ede
)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a...
author
Bill Yi
<byi@google.com>
Tue, 13 Jun 2017 02:59:10 +0000
(
02:59
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 13 Jun 2017 02:59:10 +0000
(
02:59
+0000)
am:
7729edee10
-s ours
Change-Id: If4afa0cf25e4c83097ffebb80fae620865f9e6e4
Trivial merge