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:
22961ac
a72fe6a
)
[automerger skipped] Import translations. DO NOT MERGE skipped: fc4347f98e skipped...
author
Bill Yi
<byi@google.com>
Thu, 17 May 2018 23:18:59 +0000
(16:18 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 17 May 2018 23:18:59 +0000
(16:18 -0700)
am:
a72fe6a957
-s ours
Change-Id: I659644d1abcb04788c35591a290440e8a990e79c
Trivial merge