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:
9ce893d
dafe585
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
author
Bill Yi
<byi@google.com>
Mon, 11 Jun 2018 18:48:00 +0000
(11:48 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Jun 2018 18:48:00 +0000
(11:48 -0700)
am:
dafe5854dd
-s ours
Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0
Trivial merge