Commit Graph

471459 Commits

Author SHA1 Message Date
Automerger Merge Worker
95e4f63ca0 Merge "Move hiddenapi lists droidcore calls to tools/platform-compat/." am: 24e54e64d5 am: 03a5732f74 am: 5861c6aac9 am: bce5cc5325
Change-Id: Idfaf39ad4334cc74508d185508ef2a7269ac750a
2020-02-28 16:35:12 +00:00
Automerger Merge Worker
4a4256143a Merge "Add USSD codes over IMS feature" am: 9fefb65aa9 am: 09f3bce8c6 am: a583aee08d am: e6fa44248b
Change-Id: I3113954e429f468cbabaeacb6af0afc3358820a7
2020-02-28 16:34:54 +00:00
Automerger Merge Worker
1043fb4a56 Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165 am: a1a9acbedc am: 74637f017a am: 060f56116e
Change-Id: Ie1223b28ff8b2da4526bad05078d5f0941c45cf0
2020-02-28 16:34:34 +00:00
Automerger Merge Worker
66b5a0aa17 Merge "[automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb am: c43c81018e -s ours am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a931b is in history" into rvc-qpr-dev-plus-aosp 2020-02-28 16:34:10 +00:00
Automerger Merge Worker
ac423f5497 [automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb am: c43c81018e -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a931b is in history

Change-Id: Ia293f8d8a2df7068bd5f95464d323e3a0d6afa49
2020-02-28 16:34:06 +00:00
Automerger Merge Worker
8992e9a862 [automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: fde78e783f -s ours am: 973397face -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a931b is in history

Change-Id: If478b464012fe67baa8658748eda58939c8832d8
2020-02-28 16:34:05 +00:00
Automerger Merge Worker
4f3e394eb7 Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb am: 2ce68d8274
Change-Id: Id68348698d4f8878e25a34335abe1e0d26891ded
2020-02-28 16:33:49 +00:00
Automerger Merge Worker
bce5cc5325 Merge "Move hiddenapi lists droidcore calls to tools/platform-compat/." am: 24e54e64d5 am: 03a5732f74 am: 5861c6aac9
Change-Id: Id8f97a248236f873f85368bbcec4172c279864e1
2020-02-28 16:26:57 +00:00
Automerger Merge Worker
e6fa44248b Merge "Add USSD codes over IMS feature" am: 9fefb65aa9 am: 09f3bce8c6 am: a583aee08d
Change-Id: I3ee0e068b4850ac2e2f7bb5799b3e27aac12e09e
2020-02-28 16:26:41 +00:00
Automerger Merge Worker
060f56116e Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165 am: a1a9acbedc am: 74637f017a
Change-Id: I4785593049635d84ef231405cc532b925f2eb784
2020-02-28 16:26:20 +00:00
Automerger Merge Worker
5861c6aac9 Merge "Move hiddenapi lists droidcore calls to tools/platform-compat/." am: 24e54e64d5 am: 03a5732f74
Change-Id: I43d5e74c4bd097ddad8e0764f9abb7d45f976908
2020-02-28 16:24:06 +00:00
Automerger Merge Worker
a583aee08d Merge "Add USSD codes over IMS feature" am: 9fefb65aa9 am: 09f3bce8c6
Change-Id: Ie56595ba901ba83e8691583883f75c17a874ccaa
2020-02-28 16:23:45 +00:00
Automerger Merge Worker
03a5732f74 Merge "Move hiddenapi lists droidcore calls to tools/platform-compat/." am: 24e54e64d5
Change-Id: I196c308c6ee2d7ae544b1cff9086c1696a850d74
2020-02-28 16:23:23 +00:00
Automerger Merge Worker
74637f017a Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165 am: a1a9acbedc
Change-Id: I18268a53f8fb2c45099adc1a0b7abe9845a93567
2020-02-28 16:23:12 +00:00
Automerger Merge Worker
c43c81018e Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb
Change-Id: I238944551d826918e589fe62fda08a865ea8bf73
2020-02-28 16:22:54 +00:00
Automerger Merge Worker
973397face [automerger skipped] Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: fde78e783f -s ours
am skip reason: Change-Id Iccc60233baaeaa732f197d7aaf31acc9d75a247b with SHA-1 bb1d2a931b is in history

Change-Id: Iff9af2e5ec0abcb54999339ee77f3ab9684d8c34
2020-02-28 16:22:54 +00:00
Automerger Merge Worker
2ce68d8274 Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041 am: 04fadaadeb
Change-Id: I68beab32ca6f076c1c4dd2aff346cf9975123a10
2020-02-28 16:22:31 +00:00
satayev
24e54e64d5 Merge "Move hiddenapi lists droidcore calls to tools/platform-compat/." 2020-02-28 16:11:10 +00:00
Automerger Merge Worker
fde78e783f Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041
Change-Id: I3624c67ef6a93fc902120b1ac3325c11aee4c65a
2020-02-28 16:09:40 +00:00
Automerger Merge Worker
04fadaadeb Merge "Fix testScreenCaptureDisabled" into rvc-dev am: 20905ec041
Change-Id: I509b6d1568e2cba4d54a218a63509a6e9ffee418
2020-02-28 16:09:37 +00:00
Automerger Merge Worker
ccedc80e04 Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04ab8a3c02 am: da2caa7f87
Change-Id: Ie225e69160d234f89402968c9e5110515a89b681
2020-02-28 16:05:01 +00:00
Automerger Merge Worker
6c5e6f8b16 Merge "Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04a79624d9" into rvc-d1-dev-plus-aosp am: 581c55a7fa
Change-Id: Icaa959293899de488beccd155150e6fd9833f926
2020-02-28 16:04:25 +00:00
Automerger Merge Worker
09f3bce8c6 Merge "Add USSD codes over IMS feature" am: 9fefb65aa9
Change-Id: I121791b174bb89f758504aad27ddde4b1bd611eb
2020-02-28 16:03:48 +00:00
Automerger Merge Worker
e9559fdbcf Merge "Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: ed4230a2b6" into rvc-d1-dev-plus-aosp am: 619fc103d0
Change-Id: I5ecf9c4b7464fc038ced369c39ac2c43d308e558
2020-02-28 16:03:39 +00:00
Automerger Merge Worker
ebcc664153 Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04a79624d9 am: c93056bcd0
Change-Id: I9e3dced1182fbbaf78f17612a66a8bea6f623a01
2020-02-28 16:03:25 +00:00
Automerger Merge Worker
8c8c8bcb0a Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: beb6c65e77 am: 12baffe68d
Change-Id: Ia055678037a98be9be366d401967cb2dee421892
2020-02-28 16:03:02 +00:00
Automerger Merge Worker
fda8aaa9a5 Merge "Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: beb6c65e77 am: 75c2a4985f" into rvc-qpr-dev-plus-aosp 2020-02-28 16:02:54 +00:00
Automerger Merge Worker
80fd952033 Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: beb6c65e77 am: 75c2a4985f
Change-Id: I42f18fd2466898278da7aaffbe62b4c033a83c78
2020-02-28 16:02:49 +00:00
Automerger Merge Worker
ea3d673be0 Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: 65163078e1 am: c342f3ac63
Change-Id: I54e319b0db9b907e5423730a424427f6aa724f31
2020-02-28 16:02:44 +00:00
Automerger Merge Worker
bb4f8d96c6 Merge "Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d am: 3568f17c74" into rvc-qpr-dev-plus-aosp 2020-02-28 16:02:35 +00:00
Automerger Merge Worker
c17271bd3d Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d am: 3568f17c74
Change-Id: I373edc4ea5f44f0be2278e9094967d431dc39a54
2020-02-28 16:02:30 +00:00
Automerger Merge Worker
7a49c1f846 Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d am: eeb948f3a1
Change-Id: I424047b08b46d52537ceca19c93f30a0a15e81d6
2020-02-28 16:02:26 +00:00
Automerger Merge Worker
f23464484c Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e am: d3077295c9 am: 0a9a7dca4e
Change-Id: Ie2116727f801d538913f35f951fbc5172798bdfe
2020-02-28 16:02:09 +00:00
Automerger Merge Worker
a1a9acbedc Merge "Format incoming call numbers with the national format for Japan" am: 1b637fe165
Change-Id: I5cfcb157650b14f26f3493447afc2943327cdd15
2020-02-28 16:01:54 +00:00
Automerger Merge Worker
18b597e81e Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e am: d3077295c9 am: bf43824b27
Change-Id: Iaa89328cb490969213b8c0eb0e78eb0adc9c76bd
2020-02-28 16:01:43 +00:00
Automerger Merge Worker
97c25a5c61 Merge changes Ic91ff7ac,I7d118592 into rvc-dev am: b2c82a055e am: 2007a8754c am: 82b085e41d
Change-Id: I8de92653649b6d0e4626de311f58594f68f7b669
2020-02-28 16:01:16 +00:00
TreeHugger Robot
20905ec041 Merge "Fix testScreenCaptureDisabled" into rvc-dev 2020-02-28 15:54:52 +00:00
Tyler Gunn
9fefb65aa9 Merge "Add USSD codes over IMS feature" 2020-02-28 15:48:56 +00:00
Automerger Merge Worker
c93056bcd0 Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04a79624d9
Change-Id: I579aea56485f07df23ec39aca6c4f3d7076f1cac
2020-02-28 15:48:17 +00:00
Automerger Merge Worker
da2caa7f87 Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04ab8a3c02
Change-Id: I7e538513b2a7360ab89e4d91497a19c20d3d9cee
2020-02-28 15:48:16 +00:00
Tyler Gunn
1b637fe165 Merge "Format incoming call numbers with the national format for Japan" 2020-02-28 15:48:15 +00:00
Automerger Merge Worker
75c2a4985f Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: beb6c65e77
Change-Id: I7f609c3aa6c5a87e0504e63a90ee2c170b91874d
2020-02-28 15:48:01 +00:00
Automerger Merge Worker
3568f17c74 Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d
Change-Id: I73e836c45743f96f966f9c9beaad2e8a7302ca68
2020-02-28 15:47:41 +00:00
Automerger Merge Worker
581c55a7fa Merge "Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04a79624d9" into rvc-d1-dev-plus-aosp 2020-02-28 15:47:40 +00:00
Automerger Merge Worker
619fc103d0 Merge "Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: ed4230a2b6" into rvc-d1-dev-plus-aosp 2020-02-28 15:47:36 +00:00
Automerger Merge Worker
2e788718af Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04a79624d9
Change-Id: Ie1493d3591f8c2c528c94fff50d5024bb66fa717
2020-02-28 15:47:36 +00:00
Automerger Merge Worker
12baffe68d Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: beb6c65e77
Change-Id: I45c9c8632021be4d624cf113108329f01b5d6868
2020-02-28 15:47:29 +00:00
Automerger Merge Worker
a0ba9f5908 Merge "Ignore package mode for MANAGE_EXTERNAL_STORAGE" into rvc-dev am: ab2132d460 am: ed4230a2b6
Change-Id: I0a8bdfc8d94cae827b627e8b6325732bd48f2761
2020-02-28 15:47:29 +00:00
Automerger Merge Worker
c342f3ac63 Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: 65163078e1
Change-Id: I1ef8eecc0453ea706bfcc91b11fa514969d1c342
2020-02-28 15:47:15 +00:00
Automerger Merge Worker
eeb948f3a1 Merge "Fix mmap errors when reading font files via the AssetManager." into rvc-dev am: 8cf381064f am: a161f3f17d
Change-Id: I2d553ac422b19bbbe1ee2d76e5f8c3009ecbad7f
2020-02-28 15:47:04 +00:00