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:
fcd7cc1
124cc34
)
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
author
Bill Yi
<byi@google.com>
Mon, 11 Jun 2018 18:35:00 +0000
(11:35 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Jun 2018 18:35:00 +0000
(11:35 -0700)
am:
124cc34793
-s ours
Change-Id: If5c49902987b4bd076509abf86aafe7407c2525b
Trivial merge