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:
1a3e0d1
d460cc4
)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 481f84...
author
Bill Yi
<byi@google.com>
Thu, 24 May 2018 00:53:10 +0000
(17:53 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 24 May 2018 00:53:10 +0000
(17:53 -0700)
am:
d460cc4963
-s ours
Change-Id: I0d0514a010d45ac6715d2b3fbe175291d4d73a29
Trivial merge