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:
078de80
1ed0a31
)
[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped...
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 22:37:07 +0000
(22:37 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Jan 2018 22:37:07 +0000
(22:37 +0000)
am:
1ed0a31ee3
-s ours
Change-Id: I9cbde4b6406e394293ad3ad51dc6000f7c68e179
Trivial merge