Commit Graph

1107 Commits

Author SHA1 Message Date
TreeHugger Robot
2be7b9faac Merge "Import translations. DO NOT MERGE" 2020-04-10 06:05:53 +00:00
Paul Hu
487a7fc552 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 am: 251bbcbfc5 am: cc8ffc96c0 -s ours am: 3868bfe5c0 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history

Change-Id: I843010994a1ea4e9db259405f4b10f68f43d03ee
2020-04-09 07:55:06 +00:00
Automerger Merge Worker
f4293e4c30 Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours" into rvc-d1-dev-plus-aosp am: a028215e7f -s ours am: 3211ee1ace -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history

Change-Id: Iab189d69fcc0fbf1d08686a2cfae3ea59eda8e56
2020-04-09 07:54:39 +00:00
Paul Hu
806c8be6e9 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 -s ours am: c171ef8ed3 -s ours am: 3fc9dbd826 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I7783b979772828729513a94b2ad4a2958f142f72
2020-04-09 07:54:13 +00:00
Paul Hu
3868bfe5c0 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 am: 251bbcbfc5 am: cc8ffc96c0 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history

Change-Id: I368ab4a2d9887730660f27e9d95fe0f3afa43659
2020-04-09 07:54:10 +00:00
Automerger Merge Worker
3211ee1ace Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours" into rvc-d1-dev-plus-aosp am: a028215e7f -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history

Change-Id: If5fcedd4405a6ce59c74b6d42fe6d089c3c62810
2020-04-09 07:34:26 +00:00
Paul Hu
cc8ffc96c0 Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 am: 251bbcbfc5
Change-Id: I56ac87b28c26d178adaebb60457a4d3359a8d27a
2020-04-09 07:34:01 +00:00
Paul Hu
3fc9dbd826 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 -s ours am: c171ef8ed3 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: Ic9d1c1f7170c7b44aada089f57154629eb596911
2020-04-09 07:33:52 +00:00
Automerger Merge Worker
a028215e7f Merge "[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours" into rvc-d1-dev-plus-aosp 2020-04-09 07:14:58 +00:00
Paul Hu
0082e52734 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours am: f097d7e7c4 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I85efeb46d61dc130acc77ddc8cadba8014bb920b
2020-04-09 07:14:49 +00:00
Paul Hu
c171ef8ed3 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I18d2bd8063a82e1311248d88c08863beae4ca959
2020-04-09 07:14:35 +00:00
Paul Hu
ca9da38524 Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82
Change-Id: I96283fd4245fffa0b40c9f52cabeba7b5d48ea89
2020-04-09 06:58:04 +00:00
Paul Hu
f097d7e7c4 [automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 -s ours
am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 eaa2b0e30a is in history

Change-Id: I58431d6a0969b0de91e000578bd176caa6d19862
2020-04-09 06:57:53 +00:00
Bill Yi
f3d18d43fc Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5fad2cb9cbe12cf0eb1d046317d420667a262b8e
2020-04-08 23:37:10 -07:00
Paul Hu
fab349c0a9 Address aosp/1274403 leftover comment
Bug: 152828142
Test: atest EntitlementManagerTest

Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
Merged-In: I81f2d268c9f26bc4488b06032477a73d071f73f8
(cherry picked from commit 9fe0a868e909a4cd1c1c63bf981441f1b9128890)
2020-04-09 02:13:32 +00:00
Paul Hu
9cb40bc8fc [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e am: 6c156c85cf am: 65e78f0ccf -s ours am: dd7ac3276b -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 b33911c19c is in history

Change-Id: Ibef73c3149436d5ec9c69d116cf6d7ea0ef8465e
2020-04-08 10:49:30 +00:00
Paul Hu
6d22a83d48 [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours am: f0c477b54a -s ours am: 5bcdc0f947 -s ours am: 11e0ad638f -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 b33911c19c is in history

Change-Id: Ie58f24811f0fbdb6904bce6559f3d71dc43d1a72
2020-04-08 10:49:00 +00:00
Automerger Merge Worker
967024dfd1 Merge "[automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e -s ours" into rvc-d1-dev-plus-aosp am: 4d9e225770 -s ours am: 55ed56a76d -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: Ib521b7be516d295509387d44ff36e005c656bf37
2020-04-08 10:48:41 +00:00
Paul Hu
dd7ac3276b [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e am: 6c156c85cf am: 65e78f0ccf -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 b33911c19c is in history

Change-Id: I3423330eae8fb0d4b111c621d855b427a2274d8f
2020-04-08 10:47:59 +00:00
Paul Hu
65e78f0ccf Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e am: 6c156c85cf
Change-Id: I3320229b0db242499041df6dc1e176f2efb8929a
2020-04-08 10:35:57 +00:00
Paul Hu
11e0ad638f [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours am: f0c477b54a -s ours am: 5bcdc0f947 -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 b33911c19c is in history

Change-Id: Ib78f9ddf833f090b1199916ade2ee297652fe6d4
2020-04-08 10:35:56 +00:00
Automerger Merge Worker
55ed56a76d Merge "[automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e -s ours" into rvc-d1-dev-plus-aosp am: 4d9e225770 -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: Ie8d34a008bf62c1bdb4a8769b17c8d3f348c44de
2020-04-08 10:35:49 +00:00
Paul Hu
5bcdc0f947 [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours am: f0c477b54a -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: Ida906ffb11a704782a96dad6bd7f886a8b0c6571
2020-04-08 10:17:42 +00:00
Paul Hu
1a571fc91f [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: Ia7c07bfcedff2767e63a0bc15faaa3e8d237a9af
2020-04-08 10:17:35 +00:00
Paul Hu
231005897e Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457
Change-Id: Id9c327f22f44cfb908e70b3031fba7bd9381467b
2020-04-08 10:00:22 +00:00
Paul Hu
f0c477b54a [automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours
am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: I8127f6ddc3f6eeca415cc168c2653b839f86d541
2020-04-08 10:00:16 +00:00
Paul Hu
bb1f4a6f2b Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d am: 7e8f78291c am: aa4e34d823
Change-Id: I07dd1b7ef7f52c57a7d5020e4d274950923a50fb
2020-04-08 08:51:23 +00:00
Paul Hu
aa4e34d823 Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d am: 7e8f78291c
Change-Id: I3cfca08a475c2d0a8cc157011c41ce5a2d8f89ee
2020-04-08 08:29:52 +00:00
Automerger Merge Worker
b33911c19c Fix TetheringIntegrationTests failure
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
Merged-In: I5a537eca9b1aab3694a11a2dab147a31f289314c
(cherry picked from commit f626b8a5388746d163600a5eccb60e22cb1071bf)
2020-04-08 08:17:20 +00:00
Paul Hu
7e8f78291c Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d
Change-Id: I97924c2caf89eb6021e1b42c688c317a93b104fd
2020-04-08 08:12:25 +00:00
Paul Hu
77908d971d Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911
Change-Id: I420e4c0f9ae9f95dec822257c5dabf10f9b79201
2020-04-08 07:57:59 +00:00
Paul Hu
3d363f0911 Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9
Change-Id: I89d306a86ae993b0fdc26c701624d5c6735f0df7
2020-04-08 07:46:52 +00:00
Paul Hu
9f33a5a7d9 Merge "Address aosp/1274403 leftover comment" 2020-04-08 07:36:35 +00:00
Automerger Merge Worker
2a07469306 Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d am: e271f0784f
Change-Id: I4ef0b8c08c7fb621c11378846ab934d854c3fb18
2020-04-08 07:13:44 +00:00
Automerger Merge Worker
e271f0784f Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d
Change-Id: I80da3a609f7161964193a7f49358301fbd03e87b
2020-04-08 06:57:03 +00:00
Paul Hu
49d4e37c4f Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458
Change-Id: Ibd1f9252d27063f1640646ef453eb91132f53937
2020-04-08 06:40:40 +00:00
Paul Hu
c05defa458 Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb
Change-Id: Icde8ef078ec5ebde8d9c978432a9aa12b7a1e3a9
2020-04-08 06:40:20 +00:00
Mark Chien
962210ab79 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90 am: e8809b74b1 -s ours am: 222d8b255d -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: Ib4366a4e43a3032e30258671041902693ecacb48
2020-04-08 06:35:29 +00:00
Paul Hu
525df29ccb Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef
Change-Id: If65885435886fab23f7948900127df09f08c15f4
2020-04-08 06:24:03 +00:00
Mark Chien
222d8b255d [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90 am: e8809b74b1 -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: If9f59a53b71f7938fed87218529fde4f23652816
2020-04-08 06:18:17 +00:00
Paul Hu
77f43e56ef Merge "Fix TetheringIntegrationTests failure" 2020-04-08 06:12:29 +00:00
Mark Chien
e8809b74b1 Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90
Change-Id: I58ff75339f93ca53c1c39eca1eb65a2da6b5ff97
2020-04-08 06:12:01 +00:00
Mark Chien
95a7db45ea [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours am: f3de7fc1e4 -s ours am: bbfc91801b -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: If865f3e450ab12dd2aca467c6357a7b05bd52d7c
2020-04-08 06:08:21 +00:00
Mark Chien
b6159c7980 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours am: 547dd723fa -s ours am: 6905710b8d -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: I03fc6e86291d3df077201051e9c740e8d016ac6e
2020-04-08 06:07:57 +00:00
Mark Chien
bbfc91801b [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours am: f3de7fc1e4 -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: Ia726364ed377cb70b92fe4b84d2b39e15c9f9490
2020-04-08 06:07:37 +00:00
Mark Chien
6905710b8d [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours am: 547dd723fa -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: I94fc806bac5ac159c83e2667f7af912d5d3bac50
2020-04-08 06:07:04 +00:00
Mark Chien
f3de7fc1e4 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: If4478d24c7b10a5de4e1dc7cbbe1ec7eeba1d75f
2020-04-08 06:06:34 +00:00
Mark Chien
4cea68cf9c Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f
Change-Id: I5334805bc74c20d986375fc5558f4cd5ada11ecf
2020-04-08 05:55:35 +00:00
Mark Chien
547dd723fa [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: I0eca1b568e41681cc0f361a972f529f6bb0fb738
2020-04-08 05:50:17 +00:00
Mark Chien
56f867cfd4 [automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b is in history

Change-Id: Ibfce142fdcf6c79a4220c241b63dadf147caf80c
2020-04-08 05:41:38 +00:00