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:
9604713
f0acd85
)
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf6...
author
Xin Li
<delphij@google.com>
Fri, 10 May 2019 00:25:01 +0000
(17:25 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 10 May 2019 00:25:01 +0000
(17:25 -0700)
am:
f0acd850fb
-s ours
am skip reason: subject contains skip directive
Change-Id: I6f942defbfadc4843ec881dd08feaf61db69d3d6
Trivial merge