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:
da5fb6e
15123e0
)
[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped...
author
Bill Yi
<byi@google.com>
Mon, 18 Jun 2018 06:50:41 +0000
(23:50 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 18 Jun 2018 06:50:41 +0000
(23:50 -0700)
am:
15123e0230
-s ours
Change-Id: I1f7790c7a09b36424a524fa3010dd2b6fe43fc1e
Trivial merge