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:
876a1f7
cd4371f
)
[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 21:50:18 +0000
(21:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Jan 2018 21:50:18 +0000
(21:50 +0000)
am:
cd4371f3cc
-s ours
Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488
Trivial merge