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:
6ac1763
9a5e67d
)
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: db768d45e0 -s ours
author
Bill Yi
<byi@google.com>
Thu, 19 Oct 2017 17:14:58 +0000
(17:14 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 19 Oct 2017 17:14:58 +0000
(17:14 +0000)
am:
9a5e67dba9
-s ours
Change-Id: I4b26cbf3a5f9c5fadb88bb90db948bc605cd48e5
Trivial merge