Commit Graph

435954 Commits

Author SHA1 Message Date
Kevin Hufnagle
8ea366e1b0 Merge "docs: Edited sharedUserId deprecation message" into qt-dev am: 35b69e2ca3 am: 4250ee9ce5
am: bc42ebbfe3

Change-Id: Ia3a5fbd7ec55ec2ea37a18109a3675d3ac3550af
2019-10-07 13:15:48 -07:00
Kevin Hufnagle
bc42ebbfe3 Merge "docs: Edited sharedUserId deprecation message" into qt-dev am: 35b69e2ca3
am: 4250ee9ce5

Change-Id: Ifeaad657c6662fb680e208ae7558faad26459eb3
2019-10-07 13:09:14 -07:00
Kevin Hufnagle
4250ee9ce5 Merge "docs: Edited sharedUserId deprecation message" into qt-dev
am: 35b69e2ca3

Change-Id: I5f1fbce04b8e7f70d623e15dce2c13d122cba95c
2019-10-07 12:53:36 -07:00
Kevin Hufnagle
35b69e2ca3 Merge "docs: Edited sharedUserId deprecation message" into qt-dev 2019-10-07 19:35:38 +00:00
Peiyong Lin
26cbc3235b Merge "Add owners for GraphicsEnvironment.java." am: f605363ce4 am: da6a180c3c
am: 7f20633990

Change-Id: I7d387b6959d9fed06b838f0b129edff07e6daf00
2019-10-07 10:23:10 -07:00
Tao Bao
f4e2a8c352 Merge "Use ParcelFileDescriptor over FileDescriptor" am: 56f111e13b am: d0ad6794d4
am: 4e4890a362

Change-Id: I4ebd814f61585ebd9358fa82cc0478fdb8f8e038
2019-10-07 10:17:26 -07:00
Peiyong Lin
7f20633990 Merge "Add owners for GraphicsEnvironment.java." am: f605363ce4
am: da6a180c3c

Change-Id: I0af9eb50c2f85255620387256770fa7a66858856
2019-10-07 10:17:21 -07:00
Tao Bao
4e4890a362 Merge "Use ParcelFileDescriptor over FileDescriptor" am: 56f111e13b
am: d0ad6794d4

Change-Id: Id53a5c0f7d56b2dcde839052e2e7c040c9751d69
2019-10-07 10:10:20 -07:00
Peiyong Lin
da6a180c3c Merge "Add owners for GraphicsEnvironment.java."
am: f605363ce4

Change-Id: I443ea03f00258b51d8b536452c0771a985dd1a54
2019-10-07 10:04:25 -07:00
Tao Bao
d0ad6794d4 Merge "Use ParcelFileDescriptor over FileDescriptor"
am: 56f111e13b

Change-Id: I68c75d02a4eb4bc74fb83efe12ec5dce8d41f7f3
2019-10-07 09:57:55 -07:00
Peiyong Lin
f605363ce4 Merge "Add owners for GraphicsEnvironment.java." 2019-10-07 16:43:11 +00:00
Tao Bao
56f111e13b Merge "Use ParcelFileDescriptor over FileDescriptor" 2019-10-07 16:38:11 +00:00
Alan Stokes
8265b02e10 Merge "Revert new app installed notification doc" into qt-dev am: 98540e2a16 am: 24e18b415f
am: 1275551f18

Change-Id: I025b2110d9b5405455b08e4928d3d6480ce61f83
2019-10-07 08:42:42 -07:00
Alan Stokes
36ac62aaa8 Merge "Revert new app installed notification doc" into qt-dev am: 98540e2a16 am: 24e18b415f
am: 9ed11c9dea

Change-Id: I639bb92f80a8be435014b6d52c6577b337121fca
2019-10-07 08:36:47 -07:00
Alan Stokes
9ed11c9dea Merge "Revert new app installed notification doc" into qt-dev am: 98540e2a16
am: 24e18b415f

Change-Id: I2675329bb8a87beb1e8c221f35e12f0fa675445a
2019-10-07 08:30:38 -07:00
Alan Stokes
1275551f18 Merge "Revert new app installed notification doc" into qt-dev am: 98540e2a16
am: 24e18b415f

Change-Id: I886882a9c90b8e6c4a275647801b9bf4a95f3750
2019-10-07 08:30:37 -07:00
Alan Stokes
24e18b415f Merge "Revert new app installed notification doc" into qt-dev
am: 98540e2a16

Change-Id: I12b1bf9c6c078ee1629e2135140ccd59b8f9da81
2019-10-07 08:18:41 -07:00
Nikita Ioffe
b139b13836 Merge "Make init.updatable_crashing a read/write property" am: c6a12ee85c am: a027bee3d7
am: 1c06fe7b9a

Change-Id: If1db3f7811b96bd7f2b9f38ce9f31a3129249610
2019-10-07 07:46:50 -07:00
Alan Stokes
98540e2a16 Merge "Revert new app installed notification doc" into qt-dev 2019-10-07 14:41:57 +00:00
Nikita Ioffe
1c06fe7b9a Merge "Make init.updatable_crashing a read/write property" am: c6a12ee85c
am: a027bee3d7

Change-Id: I247f28ebbd9e9f6a8528142e9ab5f83b4693799e
2019-10-07 07:35:39 -07:00
Nikita Ioffe
a027bee3d7 Merge "Make init.updatable_crashing a read/write property"
am: c6a12ee85c

Change-Id: I1c82e8f2631323e7cc16f1cbbe0c20912d71f4ca
2019-10-07 07:10:55 -07:00
Nikita Ioffe
c6a12ee85c Merge "Make init.updatable_crashing a read/write property" 2019-10-07 13:51:25 +00:00
Chalard Jean
70b752f4e0 Merge "Rename CallbackRecord to CallbackEntry" am: 36ad0924b9 am: cbc0d9dbfc
am: 71a03d5538

Change-Id: If53d8d66c21d27a5e77a48a5234092aaa0bf8ad0
2019-10-06 23:03:02 -07:00
Chalard Jean
71a03d5538 Merge "Rename CallbackRecord to CallbackEntry" am: 36ad0924b9
am: cbc0d9dbfc

Change-Id: I07ef4756a74c0c670fc5fbb4bdd8ac61344adc0a
2019-10-06 22:50:49 -07:00
Chalard Jean
cbc0d9dbfc Merge "Rename CallbackRecord to CallbackEntry"
am: 36ad0924b9

Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266
2019-10-06 22:39:47 -07:00
Chalard Jean
36ad0924b9 Merge "Rename CallbackRecord to CallbackEntry" 2019-10-07 05:28:57 +00:00
Chalard Jean
059c426d15 Rename CallbackRecord to CallbackEntry
Test: FrameworkNetTests NetworkStackTests
Change-Id: I8f6ea8fb6879cf7c40396d92f13cb5e12cc45ee7
2019-10-07 13:00:50 +09:00
Android Build Merger (Role)
dcad223fb3 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours am: efec4764b4 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-10-06 06:52:28 +00:00
Bill Yi
11d487498e [automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours
am: efec4764b4 -s ours
am skip reason: subject contains skip directive

Change-Id: I33cb88cdcb797a7868d32f8caead5aa6707e8dc9
2019-10-05 23:50:45 -07:00
Bill Yi
039759c1c9 [automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours
am: 14b68c1231 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibff41789e28aed1039e937beb0bb3d24e51d10c1
2019-10-05 23:50:41 -07:00
Bill Yi
efec4764b4 [automerger skipped] Import translations. DO NOT MERGE
am: 332e8f4e81 -s ours
am skip reason: subject contains skip directive

Change-Id: Id2f6efd386d21d7a80994896ed40f45d896e4716
2019-10-05 23:30:09 -07:00
Bill Yi
14b68c1231 [automerger skipped] Import translations. DO NOT MERGE
am: 332e8f4e81 -s ours
am skip reason: subject contains skip directive

Change-Id: I15f0d2a038a48ebca16ecb7890109f808583befb
2019-10-05 23:30:08 -07:00
Bill Yi
c954634c87 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: e258cc65f6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia782c09a9bc42c0c4ac3ed3586bd42c1337e6ed1
2019-10-05 23:17:36 -07:00
TreeHugger Robot
e258cc65f6 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-06 05:53:16 +00:00
Bill Yi
f0cd160410 Import translations. DO NOT MERGE
Change-Id: I995c79defa649cee05b3c78398c329876f5bc98e
Auto-generated-cl: translation import
2019-10-05 17:27:08 -07:00
Bill Yi
332e8f4e81 Import translations. DO NOT MERGE
Change-Id: Iae1b021de5e543f5b157cde38e1f693a104f1fbe
Auto-generated-cl: translation import
2019-10-05 17:17:00 -07:00
Dan Shi
849b46edb1 Merge "Move CtsDevicePolicyManagerTestCases to its own group" am: 03f8581876 am: caf2ca8cc3
am: 117dada7ec

Change-Id: I8cb3600c9968d4f1994899c0d20b6051607c2f81
2019-10-05 16:56:20 -07:00
Dan Shi
117dada7ec Merge "Move CtsDevicePolicyManagerTestCases to its own group" am: 03f8581876
am: caf2ca8cc3

Change-Id: I3c4828cf5353cbe7d2a8506f683abc6431c9f17e
2019-10-05 16:50:13 -07:00
Dan Shi
caf2ca8cc3 Merge "Move CtsDevicePolicyManagerTestCases to its own group"
am: 03f8581876

Change-Id: I4040c640bf30b7c64eeb03e3301e8f929890c79b
2019-10-05 16:43:59 -07:00
Dan Shi
03f8581876 Merge "Move CtsDevicePolicyManagerTestCases to its own group" 2019-10-05 23:29:39 +00:00
Bill Yi
a9468e1c3f [automerger skipped] Import translations. DO NOT MERGE
am: 9519141cd6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia896d947073dcb9519d8d56c8c3d03488fecea45
2019-10-05 13:44:04 -07:00
Dan Shi
3ed7d223e8 Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558 am: fbf163294a
am: 0550352f2e

Change-Id: I3541b76296d2de1f7d34d8124fc4ee90595841da
2019-10-05 12:43:29 -07:00
Dan Shi
0550352f2e Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558
am: fbf163294a

Change-Id: I23b25f09c35326a0608e6d30eaa3e7e65f1b5582
2019-10-05 12:37:30 -07:00
Dan Shi
fbf163294a Merge "Sync TEST_MAPPING file from master branch"
am: 38b83f0558

Change-Id: Ie836bbf345dfd54f657b96bc02b2c44c166d93f4
2019-10-05 12:25:17 -07:00
Dan Shi
38b83f0558 Merge "Sync TEST_MAPPING file from master branch" 2019-10-05 18:57:34 +00:00
Bill Yi
9519141cd6 Import translations. DO NOT MERGE
Change-Id: I9f9de2b8c2eba8c43c8f99ff2ad24a2af42609d7
Auto-generated-cl: translation import
2019-10-05 07:08:42 -07:00
Dan Shi
994414753f Move CtsDevicePolicyManagerTestCases to its own group
Rebase from master branch

Bug: 141061952
Test: none
Change-Id: I54d9e1fbaa1bab11581bcd66d55255ae713b1bf6
2019-10-04 22:45:39 -07:00
Dan Shi
78fdd5605f Sync TEST_MAPPING file from master branch
Bug: 141061952
Test: none
Change-Id: I5ed8cb0d499a75562f8db32989eed32a8a877ae7
2019-10-04 22:43:37 -07:00
Shuo Qian
b162d468fd Merge "Change the Listener API names" am: fe6978a73f am: 05430c9d1f
am: bc79a1c468

Change-Id: Ie1672f6e103dd59ee97b54681836d0e1fda7c2ae
2019-10-04 19:56:27 -07:00
Shuo Qian
bc79a1c468 Merge "Change the Listener API names" am: fe6978a73f
am: 05430c9d1f

Change-Id: If02631e54c5d410bf5c889ecb3a9f217318e5692
2019-10-04 19:49:22 -07:00