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:
2e38b22
4256a29
)
[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped...
author
Bill Yi
<byi@google.com>
Mon, 11 Jun 2018 20:07:02 +0000
(13:07 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Jun 2018 20:07:02 +0000
(13:07 -0700)
am:
4256a29fcc
-s ours
Change-Id: I1981ce718c800250fba896c4bdd864a5ec37a708
Trivial merge