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:
b2f2826
81a6ef9
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped...
author
Bill Yi
<byi@google.com>
Thu, 17 May 2018 23:29:55 +0000
(16:29 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 May 2018 23:29:55 +0000
(16:29 -0700)
am:
81a6ef98f3
-s ours
Change-Id: I653ae63bef34f046ac9fc9be7d0e04d818dd0d89
Trivial merge