OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a83bb08
d453b1c
)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am...
author
Xin Li
<delphij@google.com>
Tue, 26 Feb 2019 01:19:35 +0000
(17:19 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 26 Feb 2019 01:19:35 +0000
(17:19 -0800)
am:
d453b1c2ce
-s ours
am skip reason: subject contains skip directive
Change-Id: Iabdeddadc01518dfadffc300b0e458496e392fd9
Trivial merge