Commit Graph

1134 Commits

Author SHA1 Message Date
TreeHugger Robot
daf1836e92 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: f90dce2195 -s ours am: 5fdbc69718 -s ours
am skip reason: subject contains skip directive

Change-Id: Id26b79f3095116fa83baf0ea0c51b6b2b1a51be7
2020-04-14 00:44:08 +00:00
TreeHugger Robot
5fdbc69718 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: f90dce2195 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9c15809ee09fff7126cf044dc5cd26e8caa69b3
2020-04-14 00:30:15 +00:00
Bill Yi
4e7d4a611e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I562307bd38d87a0ccd16db99a41d3101f3f37670
2020-04-13 10:43:20 -07:00
Mark Chien
94bd04280a [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 am: ab9477a850 am: c1217cef03 -s ours am: eb42360f22 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I3180d4d4a2e78784dabececec066521ab73f6870
2020-04-10 14:52:41 +00:00
Mark Chien
eb42360f22 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 am: ab9477a850 am: c1217cef03 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I2b9c026028b40d65aafa074d6f3e73f2f468ec28
2020-04-10 14:45:43 +00:00
Mark Chien
0c283e2cfe [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours am: addf2cbafc -s ours am: 0633ca4c97 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I379f15d8421cadbb9a43794218a3f0fae2436e7d
2020-04-10 14:44:12 +00:00
Mark Chien
74d9f0a466 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 -s ours am: 70538b88c3 -s ours am: 2bfabf7e46 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I1b6d1efda8f014d872844ce0b6b9d50d32512f19
2020-04-10 14:43:35 +00:00
Mark Chien
0633ca4c97 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours am: addf2cbafc -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I0561f552a9b890995b8d5c987512292a9e7a1f75
2020-04-10 14:26:03 +00:00
Mark Chien
c1217cef03 Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 am: ab9477a850
Change-Id: I7d06af795731d41748729b2edcf41f2fd30cf770
2020-04-10 14:25:16 +00:00
Mark Chien
2bfabf7e46 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 -s ours am: 70538b88c3 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I687b35097132f4113a661be8cb80cefe2e637df7
2020-04-10 14:24:55 +00:00
Mark Chien
addf2cbafc [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours am: e600d2685b -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 5da1070d8f is in history

Change-Id: I8f64dc247f35087304e80763c1dc61f38d0870ea
2020-04-10 14:07:03 +00:00
Mark Chien
70538b88c3 [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 am: a00a4e12e1 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: Ib21123448c33b7842288b0e0b2ec356502884b80
2020-04-10 14:05:43 +00:00
Mark Chien
e600d2685b [automerger skipped] Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8 -s ours
am skip reason: Change-Id Ief76c98c843ba5420224cbf0f34464f366c891b7 with SHA-1 245352ed07 is in history

Change-Id: I66e4ecbfff6afc191a053a4c8c4d3603af41d519
2020-04-10 13:46:38 +00:00
Mark Chien
a00a4e12e1 Merge "Assign specific client address to dhcp server" into rvc-dev am: 1528d90dc8
Change-Id: I0cd72deb1c8cf12507321e704547df00cf328ce1
2020-04-10 13:46:32 +00:00
Treehugger Robot
5da1070d8f Assign specific client address to dhcp server
Bug: 141256482
Test: manual
      atest TetheringTests

Merged-In: Ief76c98c843ba5420224cbf0f34464f366c891b7
Change-Id: Ief76c98c843ba5420224cbf0f34464f366c891b7
2020-04-10 10:03:20 +00:00
Luke Huang
3f7127a1a4 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61 am: 16fba9fa1a -s ours am: d0f9a794db -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I24fdc9a774f89463452304ca21a1991d4354242a
2020-04-10 09:44:23 +00:00
Luke Huang
d0f9a794db [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61 am: 16fba9fa1a -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I87110d8f782b486af1beeada080d14f4fab172a1
2020-04-10 09:33:38 +00:00
Luke Huang
16fba9fa1a Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 am: bf96df2a61
Change-Id: Ib2869d21e371f6c0b3204cda950748f615610060
2020-04-10 09:14:43 +00:00
Luke Huang
aafd4bf278 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 -s ours am: c043fcc7be -s ours am: 879f659782 -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I42e8aaeb448cb9fe590b081e07a93ab3439207b1
2020-04-10 09:14:38 +00:00
Luke Huang
c652394310 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours am: 970a18a828 -s ours am: bf63b45e7f -s ours am: 9669edf0a2 -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: I1df78236bf9bd4bc2f283e56b7c8340de48b4e81
2020-04-10 09:13:34 +00:00
Luke Huang
879f659782 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 -s ours am: c043fcc7be -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: I8e482e23bdf7c182638e5867151a79b69ac55c96
2020-04-10 09:07:47 +00:00
Luke Huang
9669edf0a2 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours am: 970a18a828 -s ours am: bf63b45e7f -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: I757214458ff38462f4f986c316dc568b7a1a8a37
2020-04-10 09:06:19 +00:00
Luke Huang
c043fcc7be [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b am: 6075ca2492 -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 d20078112b is in history

Change-Id: Ie447e99479e336a7cfd06ea739853cba380eb02e
2020-04-10 08:52:16 +00:00
Luke Huang
bf63b45e7f [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours am: 970a18a828 -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: I40105154ad0ddba88d883bf18702c322785a8665
2020-04-10 08:42:24 +00:00
Luke Huang
970a18a828 [automerger skipped] Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b -s ours
am skip reason: Change-Id I984969e09f8d5196945a7412c51bd8880223ad9e with SHA-1 6ca4ec97d2 is in history

Change-Id: Ib1f389f3359d3be6d8660add26377a5a4e1906c2
2020-04-10 08:31:31 +00:00
Luke Huang
6075ca2492 Merge "Use the lastest frozen netd_aidl_interface in framework" into rvc-dev am: 723514cf9b
Change-Id: I744debe5640abf76e825b75bdb7555541d1fd289
2020-04-10 08:31:30 +00:00
TreeHugger Robot
2be7b9faac Merge "Import translations. DO NOT MERGE" 2020-04-10 06:05:53 +00:00
Luke Huang
d20078112b Use the lastest frozen netd_aidl_interface in framework
Bug: 140541991
Test: build
Merged-In: I984969e09f8d5196945a7412c51bd8880223ad9e
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-09 16:20:44 +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