Automerger Merge Worker
7fbf82a855
Merge "Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: b853a6e5db am: 501f46a9d0" into rvc-qpr-dev-plus-aosp am: 4f895631bf
...
Change-Id: I0b56380970960d7d9dc7819e2eda23d915af386b
2020-05-07 15:48:01 +00:00
Automerger Merge Worker
f3db259f2a
Merge "[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da -s ours am: 1a682c6155 -s ours" into rvc-d1-dev-plus-aosp am: 73b1696f35 -s ours am: 66fbe302dc -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 1aba7987de
2020-05-07 15:46:58 +00:00
TreeHugger Robot
028979b268
[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da am: cb50fc9690 -s ours am: 1def901d22 -s ours am: cbfbce3309 -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af
2020-05-07 15:43:37 +00:00
Automerger Merge Worker
4f895631bf
Merge "Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: b853a6e5db am: 501f46a9d0" into rvc-qpr-dev-plus-aosp
2020-05-07 15:42:35 +00:00
Mark Chien
5dcf25ba5a
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882 am: b853a6e5db am: 501f46a9d0
...
Change-Id: I2654299f58f7e99163f68a6f800ee989627de565
2020-05-07 15:42:29 +00:00
Automerger Merge Worker
66fbe302dc
Merge "[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da -s ours am: 1a682c6155 -s ours" into rvc-d1-dev-plus-aosp am: 73b1696f35 -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 1aba7987de
2020-05-07 15:42:24 +00:00
TreeHugger Robot
cbfbce3309
[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da am: cb50fc9690 -s ours am: 1def901d22 -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af
2020-05-07 15:41:35 +00:00
Mark Chien
b853a6e5db
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882
...
Change-Id: I4513b6ad6895b7d2ddeff5405742f578baec700f
2020-05-07 15:31:32 +00:00
TreeHugger Robot
f201e18a0b
[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da -s ours am: 1a682c6155 -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af
2020-05-07 15:30:22 +00:00
TreeHugger Robot
1def901d22
[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da am: cb50fc9690 -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af
2020-05-07 15:30:02 +00:00
Mark Chien
cca6aad882
Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev
2020-05-07 15:15:59 +00:00
TreeHugger Robot
cb50fc9690
Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da
...
Change-Id: I621dcbf0c11a3220d996c952639383b4351d67fd
2020-05-07 15:03:01 +00:00
TreeHugger Robot
1a682c6155
[automerger skipped] Merge "Use stable networkstack-aidl-interfaces" into rvc-dev am: aa785801da -s ours
...
am skip reason: Change-Id I507f40866d04db5ed3361831e01eaa4dfaf20bed with SHA-1 0630f383af
2020-05-07 15:03:01 +00:00
Mark Chien
7cb74ed13c
Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a am: 0245317764 am: e7e06794c8 am: d7402f798a
...
Change-Id: I1de0c20b091a2c2e711ba9e880da971779f3661d
2020-05-07 11:55:05 +00:00
Jeongik Cha
600c2070b6
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f am: 8841f71995 am: d307002162 am: 301f1bdb09
...
Change-Id: I52517653f238e714716b914cc99c65d8e1118590
2020-05-07 11:54:41 +00:00
Jeongik Cha
1aba7987de
Use stable networkstack-aidl-interfaces
...
Test: m nothing
Bug: 133526962
Original-Change: https://android-review.googlesource.com/1301313
Merged-In: I507f40866d04db5ed3361831e01eaa4dfaf20bed
Change-Id: I507f40866d04db5ed3361831e01eaa4dfaf20bed
2020-05-07 11:48:44 +00:00
Mark Chien
d7402f798a
Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a am: 0245317764 am: e7e06794c8
...
Change-Id: I8da68aa1f7ebe6b4e83f12714db521a38a849dad
2020-05-07 11:45:42 +00:00
Jeongik Cha
301f1bdb09
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f am: 8841f71995 am: d307002162
...
Change-Id: I3f5e4a17a3b7f7205c8bb1e6fba4328b704b902a
2020-05-07 11:45:10 +00:00
Mark Chien
e7e06794c8
Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a am: 0245317764
...
Change-Id: I5b3093d1aa1085293bdc092cc0bdc643669d04cc
2020-05-07 11:27:21 +00:00
Jeongik Cha
d307002162
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f am: 8841f71995
...
Change-Id: Ife21d79d591d6ce773e0fc550cb2227c3dc28018
2020-05-07 11:26:47 +00:00
Mark Chien
0245317764
Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a
...
Change-Id: Ib409b85729972e23242551beb39638aaefad0584
2020-05-07 11:26:35 +00:00
Jeongik Cha
8841f71995
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf am: d12236a66f
...
Change-Id: Ie5671f3b65a314a1b4f8be9917e02da408e00a53
2020-05-07 11:26:19 +00:00
Mark Chien
407c3afa4a
Merge "Refactor the EntitlementManager" am: 581afa0bfa
...
Change-Id: I20f7b03356592cd184b695e4ceb491d4b04cde14
2020-05-07 11:19:16 +00:00
Mark Chien
581afa0bfa
Merge "Refactor the EntitlementManager"
2020-05-07 11:14:40 +00:00
Jeongik Cha
d12236a66f
Merge "Use stable networkstack-aidl-interfaces" am: 3a22b81ccf
...
Change-Id: I278f01d4c8e31913bbc1151bd4733ff8158111d0
2020-05-07 11:12:50 +00:00
Jeongik Cha
3a22b81ccf
Merge "Use stable networkstack-aidl-interfaces"
2020-05-07 10:59:05 +00:00
Automerger Merge Worker
e4aaa2e1c4
Merge "[automerger skipped] Test tethering log dump am: c96fbe0abe -s ours am: a77b290247 -s ours" into rvc-d1-dev-plus-aosp am: 1dfe576591 -s ours am: 2fcba3db14 -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 c96fbe0abe
2020-05-07 09:05:59 +00:00
Mark Chien
ced26695b4
[automerger skipped] Test tethering log dump am: c96fbe0abe am: 044a749f37 -s ours am: dbba20fcf2 -s ours am: 7e0861baeb -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd
2020-05-07 09:03:44 +00:00
Automerger Merge Worker
2fcba3db14
Merge "[automerger skipped] Test tethering log dump am: c96fbe0abe -s ours am: a77b290247 -s ours" into rvc-d1-dev-plus-aosp am: 1dfe576591 -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 c96fbe0abe
2020-05-07 08:51:32 +00:00
Mark Chien
7e0861baeb
[automerger skipped] Test tethering log dump am: c96fbe0abe am: 044a749f37 -s ours am: dbba20fcf2 -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd
2020-05-07 08:50:51 +00:00
Automerger Merge Worker
1dfe576591
Merge "[automerger skipped] Test tethering log dump am: c96fbe0abe -s ours am: a77b290247 -s ours" into rvc-d1-dev-plus-aosp
2020-05-07 08:33:16 +00:00
Mark Chien
55e5032535
[automerger skipped] Test tethering log dump am: c96fbe0abe -s ours am: a77b290247 -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd
2020-05-07 08:33:06 +00:00
Mark Chien
dbba20fcf2
[automerger skipped] Test tethering log dump am: c96fbe0abe am: 044a749f37 -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd
2020-05-07 08:32:53 +00:00
Mark Chien
a77b290247
[automerger skipped] Test tethering log dump am: c96fbe0abe -s ours
...
am skip reason: Change-Id I01fc6969041711f7a15880144ee5eac591086ecd with SHA-1 146f6055bd
2020-05-07 08:19:22 +00:00
Mark Chien
044a749f37
Test tethering log dump am: c96fbe0abe
...
Change-Id: If48c35a4dde54b4bdd44703f3df6338267b1b542
2020-05-07 08:19:10 +00:00
Mark Chien
c96fbe0abe
Test tethering log dump
...
Bug: 145490751
Test: atest TetheringTests
Merged-In: I01fc6969041711f7a15880144ee5eac591086ecd
Change-Id: I01fc6969041711f7a15880144ee5eac591086ecd
2020-05-07 06:44:43 +00:00
markchien
9548c8580c
Override tethering module APK-in-APEX for Go variant
...
Bug: 155604224
Test: build
Change-Id: I4147173b5f3668491ff9cb7f1f86715b036d6d4b
2020-05-07 14:21:49 +08:00
Automerger Merge Worker
6ab2919b02
Merge "Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca" into rvc-dev-plus-aosp am: 3245c39745 am: 13ba213ed0 am: 7a9132ffce
...
Change-Id: I0f402dd1be39f3ed40f2802b0d167358bb08a898
2020-05-07 04:49:14 +00:00
Automerger Merge Worker
7a9132ffce
Merge "Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca" into rvc-dev-plus-aosp am: 3245c39745 am: 13ba213ed0
...
Change-Id: I543f23441b1cbe538f5b9d1e785306d6289623c4
2020-05-07 04:29:16 +00:00
Automerger Merge Worker
13ba213ed0
Merge "Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca" into rvc-dev-plus-aosp am: 3245c39745
...
Change-Id: Ic5907ba1e590171172d06ea3164b1511b8a00eef
2020-05-07 04:12:33 +00:00
Mark Chien
80aa028b9c
Merge "Test tethering log dump" am: 0e3371469e am: 3369043fca
...
Change-Id: I20e8808afefaf0d5964871db976e288191a75ad7
2020-05-07 03:49:42 +00:00
Mark Chien
3369043fca
Merge "Test tethering log dump" am: 0e3371469e
...
Change-Id: I3218a3c600ffc4be33a660362cbb5dd001437171
2020-05-07 03:26:47 +00:00
Mark Chien
0e3371469e
Merge "Test tethering log dump"
2020-05-07 03:09:11 +00:00
Anton Hansson
146c9d45b7
Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: 834ffa7f52 am: 316551f5a4 am: a35965d94d
...
Change-Id: I0cc5403a9e7a5536cb872b5caf2c782968bf93df
2020-05-06 10:28:15 +00:00
Automerger Merge Worker
9a05a3a090
Merge "Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: b79d07bb0e am: 05b28e03c5 am: 6e56ed82f8"
2020-05-06 10:25:01 +00:00
Anton Hansson
5b83cf5e8a
Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: b79d07bb0e am: 05b28e03c5 am: 6e56ed82f8
...
Change-Id: I50513fc83b60cc369dcb4763d407cd09a18307d0
2020-05-06 10:24:47 +00:00
Anton Hansson
acc558a279
Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: b79d07bb0e am: 05b28e03c5 am: 6e56ed82f8
...
Change-Id: I2fed16e195880a4ecb03dacf1aa3787d2f7794d3
2020-05-06 10:24:21 +00:00
Anton Hansson
a35965d94d
Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: 834ffa7f52 am: 316551f5a4
...
Change-Id: I61860f5489a606565a60c093bab45b3740b6d620
2020-05-06 10:01:18 +00:00
Anton Hansson
6e56ed82f8
Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: b79d07bb0e am: 05b28e03c5
...
Change-Id: I2ec63c27beb5a75cd1b94260149e21df21cc7353
2020-05-06 09:59:19 +00:00
Anton Hansson
316551f5a4
Merge "Enable api lint and check_last_api for modules" into rvc-dev am: 3f34b58cee am: 834ffa7f52
...
Change-Id: I81662ba6b2b6fe2f710ba80f35c295821dc5259d
2020-05-06 09:45:23 +00:00
