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:
f12bc63
5e22a7d
)
Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus...
author
Android Build Merger (Role)
<noreply-android-build-merger@google.com>
Wed, 5 Jun 2019 09:40:35 +0000
(09:40 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 5 Jun 2019 09:40:35 +0000
(09:40 +0000)
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e
skipped:
ed126b5d96
skipped:
0b52ca4693
am:
65294e6ee5
-s ours am:
c808f15cbe
-s ours am:
0b36c5e9ba
-s ours am:
e7c298885b
-s ours am:
ca593c204a
-s ours am:
7d3edc88a9
-s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf
is in history
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e
skipped:
e537ffece8
skipped:
8f70c24f2d
skipped:
188904e631
skipped:
ceb1ed0a09
am:
bfe5b37bc8
-s ours am:
530fa8b25b
-s ours am:
20b5a01f6c
-s ours am:
2d387349db
-s ours am:
f7cd796ea8
-s ours am:
152f4c8345
-s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf
is in history
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
am:
6dbb3108a7
-s ours am:
59348982d3
-s ours am:
d20d75c39b
-s ours am:
971190b08a
-s ours am:
ab2ad075b3
-s ours am:
05b744c5eb
-s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf
is in history
Trivial merge