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:
9b90490
19f0813
)
[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped...
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 19:04:31 +0000
(19:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Jan 2018 19:04:31 +0000
(19:04 +0000)
am:
19f08130b1
-s ours
Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c
Trivial merge