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:
db28fe1
0911a97
)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c168312e92 ...
author
Bill Yi
<byi@google.com>
Thu, 30 Nov 2017 22:16:54 +0000
(22:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 30 Nov 2017 22:16:54 +0000
(22:16 +0000)
am:
0911a97fc2
-s ours
Change-Id: Ifa5d3eca8a9fbcd614faa63bedf8f76d2bfcf926
Trivial merge