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:
e5eaa05
eef3457
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped...
author
Bill Yi
<byi@google.com>
Fri, 18 May 2018 00:35:54 +0000
(17:35 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 18 May 2018 00:35:54 +0000
(17:35 -0700)
am:
eef34578b3
-s ours
Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b
Trivial merge