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:
f227dad
0af21ab
)
[automerger skipped] Import translations. DO NOT MERGE skipped: c425155ab8 skipped...
author
Bill Yi
<byi@google.com>
Mon, 16 Apr 2018 20:42:12 +0000
(13:42 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 16 Apr 2018 20:42:12 +0000
(13:42 -0700)
am:
0af21ab046
-s ours
Change-Id: If9dff24f3fff2a9916d74874e2bc682b5a037c8d
Trivial merge