Chen Xu
|
b92ef48424
|
Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c am: 7ca0425127
am: a5d9fba763
Change-Id: I2c69a471dca995e474893d2ec068cc001c2c8b5f
|
2019-09-25 22:14:47 -07:00 |
|
Chen Xu
|
4427f74485
|
Merge "use packageManager @SystemAPI" am: e958bbd8ae am: 206d891d07
am: f9c3973b11
Change-Id: I824d83b6c6cada0c29a302b93644a08766c4a2a7
|
2019-09-25 22:14:34 -07:00 |
|
Bill Yi
|
fd8f5dc841
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4160fa8a6d -s ours
am: 9e4189fef5 -s ours
am skip reason: subject contains skip directive
Change-Id: I41e5a560295149dcea0500a50b07582f9cd1dae8
|
2019-09-25 22:00:51 -07:00 |
|
Chen Xu
|
a5d9fba763
|
Merge "use @SystemAPI in AppOpsManager" am: 83fe845c8c
am: 7ca0425127
Change-Id: I5deb21c0fdd034f3060a08b4d9f8ca44fdc21ddc
|
2019-09-25 21:57:12 -07:00 |
|
Bill Yi
|
d814d68a19
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 48de73d2bf -s ours
am: 36fe996360 -s ours
am skip reason: subject contains skip directive
Change-Id: I8f48142dc45512cd11a76ca997d512e6c62d08b5
|
2019-09-25 21:57:10 -07:00 |
|
Chen Xu
|
f9c3973b11
|
Merge "use packageManager @SystemAPI" am: e958bbd8ae
am: 206d891d07
Change-Id: Iec4e41628f3378876605c119ac7f7f58634d176c
|
2019-09-25 21:57:02 -07:00 |
|
Bill Yi
|
7f92027e2f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a737ae8f0d -s ours
am: 850e3c7f69 -s ours
am skip reason: subject contains skip directive
Change-Id: Icb701eb3f7e6b62e832eebf534d83108281363ba
|
2019-09-25 21:53:59 -07:00 |
|
Bill Yi
|
af21a476ea
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bc8e73ec9 -s ours
am: b1547258b7 -s ours
am skip reason: subject contains skip directive
Change-Id: I3f14fb3d9653d3686c34305217342d67eb3cd273
|
2019-09-25 21:50:14 -07:00 |
|
Bill Yi
|
9e4189fef5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4160fa8a6d -s ours
am skip reason: subject contains skip directive
Change-Id: I78d272630ed810208095b3c13e47dd4d7a8c1a12
|
2019-09-25 21:44:17 -07:00 |
|
Bill Yi
|
a8a40a5109
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 251a4aa05b -s ours
am: 86ff1a8c0f -s ours
am skip reason: subject contains skip directive
Change-Id: Ib1eebddfdd0727614dc7a5eae0831585bdc10ba8
|
2019-09-25 21:42:21 -07:00 |
|
Bill Yi
|
36fe996360
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 48de73d2bf -s ours
am skip reason: subject contains skip directive
Change-Id: I67f43c0be73d65e62c509b6b2f1fd3d3257b80fe
|
2019-09-25 21:40:52 -07:00 |
|
Bill Yi
|
2d17b86963
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8182a8e092 -s ours
am: a33dc507ea -s ours
am skip reason: subject contains skip directive
Change-Id: Id7c837a6241f71887a7f67dc1dcdb5b4d2c4d10c
|
2019-09-25 21:37:46 -07:00 |
|
Bill Yi
|
850e3c7f69
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: a737ae8f0d -s ours
am skip reason: subject contains skip directive
Change-Id: I6d6b647cd0e03a3fb530698b6ad0adc4ce2204c5
|
2019-09-25 21:37:13 -07:00 |
|
Bill Yi
|
b1547258b7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0bc8e73ec9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic15b017eb1cdadc0279c6ac187486b0eabe811a7
|
2019-09-25 21:33:43 -07:00 |
|
lumark
|
edd0e2784d
|
Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev
am: 407f2f37c8
Change-Id: If16c47f20066500e1ded6f96f64877c38bfdc5f7
|
2019-09-25 21:30:18 -07:00 |
|
Bill Yi
|
86ff1a8c0f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 251a4aa05b -s ours
am skip reason: subject contains skip directive
Change-Id: I773bb8bc2ab1167200a41f6645b5ba4650fd4514
|
2019-09-25 21:29:28 -07:00 |
|
Bill Yi
|
a33dc507ea
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8182a8e092 -s ours
am skip reason: subject contains skip directive
Change-Id: I65ec47c66fca49811194c12be145ac3d07140cbb
|
2019-09-25 21:25:37 -07:00 |
|
Chen Xu
|
7ca0425127
|
Merge "use @SystemAPI in AppOpsManager"
am: 83fe845c8c
Change-Id: I08f5b713d8af575b3b0e8f61c9ba9332d5527257
|
2019-09-25 21:18:55 -07:00 |
|
Chen Xu
|
206d891d07
|
Merge "use packageManager @SystemAPI"
am: e958bbd8ae
Change-Id: I28e807aaec27837ab31631eda97accf54198240c
|
2019-09-25 21:18:47 -07:00 |
|
TreeHugger Robot
|
4160fa8a6d
|
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
|
2019-09-26 03:47:28 +00:00 |
|
Chen Xu
|
83fe845c8c
|
Merge "use @SystemAPI in AppOpsManager"
|
2019-09-26 03:43:44 +00:00 |
|
Chen Xu
|
e958bbd8ae
|
Merge "use packageManager @SystemAPI"
|
2019-09-26 03:43:44 +00:00 |
|
TreeHugger Robot
|
48de73d2bf
|
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
|
2019-09-26 03:40:44 +00:00 |
|
TreeHugger Robot
|
a737ae8f0d
|
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
|
2019-09-26 03:38:50 +00:00 |
|
TreeHugger Robot
|
0bc8e73ec9
|
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
|
2019-09-26 03:34:20 +00:00 |
|
TreeHugger Robot
|
251a4aa05b
|
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
|
2019-09-26 03:29:46 +00:00 |
|
TreeHugger Robot
|
8182a8e092
|
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
|
2019-09-26 03:26:23 +00:00 |
|
Bill Yi
|
86e4cfec88
|
Import translations. DO NOT MERGE
Change-Id: I88ca5b7e0a0230eeff759196e588555e5d829890
Auto-generated-cl: translation import
|
2019-09-25 18:34:26 -07:00 |
|
Bill Yi
|
f63a9fe204
|
Import translations. DO NOT MERGE
Change-Id: Iec24012f3e1a71bcae31cf9c8b6fb039412df878
Auto-generated-cl: translation import
|
2019-09-25 18:23:36 -07:00 |
|
Chen Xu
|
4927f6d7da
|
use @SystemAPI in AppOpsManager
Bug: 137202333
Test: Build & unit test
Merged-In: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9
Change-Id: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9
(cherry picked from commit 324606e459)
|
2019-09-25 17:59:17 -07:00 |
|
Chen Xu
|
6a2926cd44
|
use packageManager @SystemAPI
Bug: 137202333
Test: Build
Merged-In: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8
Change-Id: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8
(cherry picked from commit 4b5f423c5c)
|
2019-09-25 17:54:07 -07:00 |
|
TreeHugger Robot
|
407f2f37c8
|
Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev
|
2019-09-26 00:42:31 +00:00 |
|
Christopher Ferris
|
6184f98dd9
|
Merge "Add support for scudo native allocator." am: 8338b11afa am: 9a3af86f6d
am: b37bf7b20f
Change-Id: I269d51cb1ce327c27074d34fa4ce05883a3fc33b
|
2019-09-25 16:24:55 -07:00 |
|
Bill Yi
|
72b6302cac
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3371f4323e -s ours
am: 999db9b2fd -s ours
am skip reason: subject contains skip directive
Change-Id: I02d59e4fe2e0a243e234617e3349d73a6ea09d9a
|
2019-09-25 16:20:20 -07:00 |
|
Bill Yi
|
94a3f227ab
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cd1ef6fddd -s ours
am: 27f72a29c7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdb12beca52d86abf771c16c5f317f9d5e8e161c
|
2019-09-25 16:08:53 -07:00 |
|
Bill Yi
|
c75cf1f0c7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 890bcfa7ac -s ours
am: 132a22ecec -s ours
am skip reason: subject contains skip directive
Change-Id: I8a91db4da2b410c9eb18e2b14f497b33d4538b17
|
2019-09-25 16:05:05 -07:00 |
|
Bill Yi
|
b2497c1d9c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 15995daccf -s ours
am: 57ac183257 -s ours
am skip reason: subject contains skip directive
Change-Id: I6736fe6855da88c230137879739b39955c237065
|
2019-09-25 16:00:54 -07:00 |
|
Christopher Ferris
|
b37bf7b20f
|
Merge "Add support for scudo native allocator." am: 8338b11afa
am: 9a3af86f6d
Change-Id: I5c97711f9f4901e6cefd171121cb4662a7951eff
|
2019-09-25 16:00:36 -07:00 |
|
Bill Yi
|
999db9b2fd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 3371f4323e -s ours
am skip reason: subject contains skip directive
Change-Id: I36e443b0c72f0fbba9f7a9cbeed06b9b02747cd2
|
2019-09-25 15:57:08 -07:00 |
|
Bill Yi
|
27f72a29c7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: cd1ef6fddd -s ours
am skip reason: subject contains skip directive
Change-Id: I67b3d208b02e3095a7c21632d3b09244a499dc5f
|
2019-09-25 15:52:54 -07:00 |
|
Bill Yi
|
e753d3c959
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b485460e3a -s ours
am: 5d3144be09 -s ours
am skip reason: subject contains skip directive
Change-Id: I131c03900e8939eadd6c15f849dd66ea24b4e9dd
|
2019-09-25 15:51:12 -07:00 |
|
Bill Yi
|
132a22ecec
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 890bcfa7ac -s ours
am skip reason: subject contains skip directive
Change-Id: I9b9c8a40ab1a81893b4479de68aadc9a13c5f57e
|
2019-09-25 15:47:06 -07:00 |
|
Android Build Merger (Role)
|
33094b44d8
|
Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am: 9c743a222d" into qt-qpr1-dev-plus-aosp
|
2019-09-25 22:46:28 +00:00 |
|
Bill Yi
|
74b8c53db9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f82c8527ab -s ours
am: 4411ca0540 -s ours
am skip reason: subject contains skip directive
Change-Id: I4cb68d51b0dd9dffff66cd851a0d2f48eb1b304d
|
2019-09-25 15:45:26 -07:00 |
|
Christopher Ferris
|
9a3af86f6d
|
Merge "Add support for scudo native allocator."
am: 8338b11afa
Change-Id: Ic7d49e5d3789c3a061f50c12481572f27fa59b5e
|
2019-09-25 15:45:03 -07:00 |
|
Lucas Dupin
|
f43017962e
|
Merge "Fix wrong Notification refactor" into qt-qpr1-dev
am: 9c743a222d
Change-Id: Ia329bece21b35d6379fbed7c72900ec7b0945131
|
2019-09-25 15:44:58 -07:00 |
|
Bill Yi
|
57ac183257
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 15995daccf -s ours
am skip reason: subject contains skip directive
Change-Id: I94fea496d08b5d61d31a895e78b2cc8617205fb7
|
2019-09-25 15:43:00 -07:00 |
|
Bill Yi
|
5d3144be09
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: b485460e3a -s ours
am skip reason: subject contains skip directive
Change-Id: I74a96eb2183b2c6006db8c0f53a5e4221ffea88f
|
2019-09-25 15:38:20 -07:00 |
|
TreeHugger Robot
|
9c743a222d
|
Merge "Fix wrong Notification refactor" into qt-qpr1-dev
|
2019-09-25 22:35:36 +00:00 |
|
Christopher Ferris
|
8338b11afa
|
Merge "Add support for scudo native allocator."
|
2019-09-25 22:34:37 +00:00 |
|