Add support for permission request rationale. (resolve conflicts)
|
|
||
187 |
|
187 |
|
188 |
|
188 |
|
189 |
|
189 |
|
190 |
|
|
|
|
190 |
|
|
191 |
|
191 |
|
192 |
|
192 |
|
193 |
|
193 |
|
194 |
|
|
|
|
194 |
|
|
195 |
|
195 |
|
196 |
|
196 |
|
197 |
|
197 |
|
198 |
|
|
|
199 |
|
|
|
200 |
|
|
|
|
198 |
|
|
|
199 |
|
|
|
200 |
|
|
|
201 |
|
|
|
202 |
|
|
201 |
|
203 |
|
202 |
|
204 |
|
203 |
|
205 |
|
|
|
||
254 |
|
256 |
|
255 |
|
257 |
|
256 |
|
258 |
|
|
259 |
|
|
|
260 |
|
|
|
261 |
|
|
|
262 |
|
|
|
263 |
|
|
|
264 |
|
|
|
265 |
|
|
|
266 |
|
|
|
267 |
|
|
|
268 |
|
|
|
269 |
|
|
|
270 |
|
|
|
271 |
|
|
|
272 |
|
|
|
273 |
|
|
|
274 |
|
|
|
275 |
|
|
257 |
|
276 |
|
258 |
|
277 |
|
259 |
|
278 |
|
|
|
||
61 |
|
61 |
|
62 |
|
62 |
|
63 |
|
63 |
|
64 |
|
|
|
|
64 |
|
|
65 |
|
65 |
|
66 |
|
66 |
|
67 |
|
67 |
|
|
|
||
72 |
|
72 |
|
73 |
|
73 |
|
74 |
|
74 |
|
75 |
|
|
|
76 |
|
|
|
77 |
|
|
|
78 |
|
|
|
79 |
|
|
|
80 |
|
|
|
|
75 |
|
|
|
76 |
|
|
|
77 |
|
|
|
78 |
|
|
81 |
|
79 |
|
82 |
|
|
|
83 |
|
|
|
|
80 |
|
|
|
81 |
|
|
|
82 |
|
|
|
83 |
|
|
|
84 |
|
|
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
|
88 |
|
|
|
89 |
|
|
|
90 |
|
|
84 |
|
91 |
|
85 |
|
92 |
|
86 |
|
93 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
45 |
|
|
|
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
46 |
|
56 |
|
47 |
|
57 |
|
48 |
|
58 |
|