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:
51cee7c
1860adf
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped...
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 23:11:49 +0000
(23:11 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Jan 2018 23:11:49 +0000
(23:11 +0000)
am:
1860adf0cd
-s ours
Change-Id: I834f8a47ed9a76b0efb9b98fdeb3ea779444c1c3
Trivial merge