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:
8993fe4
aa961b9
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped...
author
Bill Yi
<byi@google.com>
Fri, 18 May 2018 00:23:00 +0000
(17:23 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 18 May 2018 00:23:00 +0000
(17:23 -0700)
am:
aa961b929b
-s ours
Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc
Trivial merge