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:
3339763
601dd7f
)
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am...
author
Xin Li
<delphij@google.com>
Fri, 10 May 2019 04:49:27 +0000
(21:49 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 10 May 2019 04:49:27 +0000
(21:49 -0700)
am:
601dd7f647
-s ours
am skip reason: subject contains skip directive
Change-Id: Id18589a23f387618001ddf689fad3c3a39e00575
Trivial merge