Automerger Merge Worker
86e773636c
Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp am: 082ec81465
...
Change-Id: I27f364a6d71f319afb7adcff4affc5d65fe58f56
2020-05-27 22:11:54 +00:00
Alex Dale
ee2e37e935
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 am: 063db9cf02
...
Change-Id: Ifd1d680f3621a1e411a55d2838cabec2fafbc159
2020-05-27 22:11:48 +00:00
Alex Dale
94314def43
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 am: 32f70b0464
...
Change-Id: I4f6d3d744869708d538b5d0881044ab0d605e0a8
2020-05-27 22:11:40 +00:00
Automerger Merge Worker
082ec81465
Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp
2020-05-27 21:59:28 +00:00
Alex Dale
9f936a877d
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a
...
Change-Id: I300d1f145e620a908a7ea0c50c86b34469e775a7
2020-05-27 21:59:24 +00:00
Alex Dale
063db9cf02
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67
...
Change-Id: I1fee67f9cf299d5c6b482f9aebae04edd481c853
2020-05-27 21:59:20 +00:00
Alex Dale
32f70b0464
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619
...
Change-Id: I80383dcc06a4ca5a2b7854e3f8075a7f0d97cdea
2020-05-27 21:59:14 +00:00
Alex Dale
e8cfec7c67
Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53
...
Change-Id: I66a5a56e3c11a86f82e920d20e309c852d3179e8
2020-05-27 21:44:10 +00:00
Alex Dale
7eb1c2b619
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c
...
Change-Id: Idc9fe4cee6699c6d35c828f4c4fa0075f3ccfaa2
2020-05-27 21:44:02 +00:00
Alex Dale
de022fbb0a
Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c
...
Change-Id: Iae1998e8dd00a286c7d44bdb2093be860d97fb0d
2020-05-27 21:43:58 +00:00
Alex Dale
3316ea8c53
Rolled expected version number for R. am: dd70d63b76
...
Change-Id: I0e80a32a474d0e0229ef3b1f73ff06c4f60d785f
2020-05-27 21:25:03 +00:00
Alex Dale
9329bf331c
Rolled expected version number for R. am: dd70d63b76
...
Change-Id: Id8ddfa7e676b57eb0ab8261d166dd0cf8901a458
2020-05-27 21:24:39 +00:00
Alex Dale
dd70d63b76
Rolled expected version number for R.
...
[ Merge of http://go/wvgerrit/100403 ]
VersionNumberTest.VersionNumberChangeCanary was expecting a version
string of "R". However, Android rvc branch is now far enough into
development to use a numbered version: version "11".
Bug: 156853733
Test: Android license request test
Change-Id: I63d33f742c849b672b2d2402ab8423fdf2450f6f
2020-05-27 17:27:46 +00:00
TreeHugger Robot
0acdd25a3f
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9 am: 97ce58fdb6
...
Change-Id: I3ad608bffc37610c97ea3680ab371414b3b877b2
2020-05-27 05:01:14 +00:00
Automerger Merge Worker
921d55b551
Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04 am: f426b9a654
...
Change-Id: I7db894251c7eb3aaabc0c216fe6f4bda3e122679
2020-05-27 05:01:08 +00:00
TreeHugger Robot
3c7845e738
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca am: abb27ddfcd
...
Change-Id: Ibeb210572beb10d23bc3d71abc31d2514c526891
2020-05-27 05:01:01 +00:00
TreeHugger Robot
579cbdee6a
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2 am: 743f9971b8
...
Change-Id: I982fd0461d3efbcb24de944ab220d93596153b49
2020-05-27 05:00:46 +00:00
TreeHugger Robot
34ce2e765a
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a am: 5c24259ece
...
Change-Id: I216b0887cc7294d2db65159107d760c9967c9f56
2020-05-27 05:00:02 +00:00
TreeHugger Robot
a34288e1fe
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc am: 2379c7664a
...
Change-Id: I47ac491d8c5097d7372bcab1ca6667a48a8f01d8
2020-05-27 04:58:58 +00:00
TreeHugger Robot
97ce58fdb6
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9
...
Change-Id: I70bba32884ed67ad8a798e7d50b5deddc6541966
2020-05-27 04:36:25 +00:00
Automerger Merge Worker
f426b9a654
Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04
...
Change-Id: Ifb4bb6af113f2adf2e0e8069652979b9c0e6eb40
2020-05-27 04:36:20 +00:00
TreeHugger Robot
abb27ddfcd
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca
...
Change-Id: Ie1beabec62bfadfdce6b823c457f98494fcb13fa
2020-05-27 04:36:01 +00:00
TreeHugger Robot
743f9971b8
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2
...
Change-Id: Ie35b9c9c53204a75be5603a3e4f09d3f972415f1
2020-05-27 04:35:53 +00:00
TreeHugger Robot
5c24259ece
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a
...
Change-Id: I00d6da020ac8817145e70961098f12cde0856c20
2020-05-27 04:35:37 +00:00
TreeHugger Robot
2379c7664a
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc
...
Change-Id: I0fbddc068937bece40ab08ee99c73133b3ccb81d
2020-05-27 04:35:28 +00:00
TreeHugger Robot
549a259ef9
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e
...
Change-Id: I3a1441864c20a2aa34363ad29604b9af94e4dce1
2020-05-27 04:17:38 +00:00
Automerger Merge Worker
a0eb7bfe04
Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp
2020-05-27 04:17:36 +00:00
TreeHugger Robot
2308e673b2
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad
...
Change-Id: I2750207868d9444d83a627882d2c80d70767935a
2020-05-27 04:17:35 +00:00
TreeHugger Robot
e3a6cee1ed
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b
...
Change-Id: I1eddafa565b76b571a54dfacb96e02b8049cdc33
2020-05-27 04:17:33 +00:00
TreeHugger Robot
fbd9ca7eca
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad
...
Change-Id: I0114b7dd12054575199c5eeb021617842f1d5b4a
2020-05-27 04:17:32 +00:00
TreeHugger Robot
55a8c8742a
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e
...
Change-Id: I78b3ed5fd43578fe750630d37ae774a871846d00
2020-05-27 04:17:20 +00:00
TreeHugger Robot
3889252bfc
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e
...
Change-Id: I174696645e9885044023ad9177fcc6780d928178
2020-05-27 04:17:20 +00:00
TreeHugger Robot
a22fc9fa8e
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c
...
Change-Id: Ifdefc4babbdef591b73c0afb7a76035148657523
2020-05-27 04:00:57 +00:00
TreeHugger Robot
5bedd9c4ad
Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c
...
Change-Id: I992d0c2d9da83a6d192a019b1fca2c1b774bad92
2020-05-27 04:00:54 +00:00
TreeHugger Robot
089fe5d90b
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b
...
Change-Id: If61e903fb3b32cb9cf610511c07585eeb942f157
2020-05-27 04:00:28 +00:00
TreeHugger Robot
208a088e8e
Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b
...
Change-Id: I9e2aadbdbfa628e5987df9ea780c85f8a64e7b86
2020-05-27 04:00:22 +00:00
TreeHugger Robot
bd8e573e0c
Merge "The Entitlement key map was not being cleaned up." into rvc-dev
2020-05-27 03:43:48 +00:00
TreeHugger Robot
7534d9795b
Merge "Start playback timer in integration tests" into rvc-dev
2020-05-27 03:43:30 +00:00
John Bruce
93217d4228
Merge "Allow CDM to Build With Recent GCC"
2020-05-26 20:12:10 +00:00
TreeHugger Robot
7b477062af
Merge "Merging changes from http://cl/312740650 to change buganizer component id to which odk fuzz scripts log any bugs."
2020-05-21 23:35:54 +00:00
Fred Gylys-Colwell
62a58acfb1
Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 88ef970b90 am: 56995ca921
...
Change-Id: I10f9fbca4e43396910c705baf931a450a98eb952
2020-05-21 23:05:44 +00:00
Fred Gylys-Colwell
1b95e27fa9
Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 am: 0a165bbf44 am: 7e11f1c992
...
Change-Id: Ie8e52278f3acb4efd0e69b52476bfa82cb080341
2020-05-21 23:05:38 +00:00
Fred Gylys-Colwell
cd4d4f564a
Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 51cf7e4668 am: 40e2e7fa08
...
Change-Id: I21b29668ed8a9b39e8a7679ed65281d14587bba3
2020-05-21 23:05:32 +00:00
Fred Gylys-Colwell
56995ca921
Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 88ef970b90
...
Change-Id: Ied69efdc62e1b7cb07e41ca8d587f106191023b5
2020-05-21 22:54:57 +00:00
Fred Gylys-Colwell
7e11f1c992
Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 am: 0a165bbf44
...
Change-Id: I273a55182d02bf1e3ce922dc481f5b84cee96324
2020-05-21 22:54:25 +00:00
Fred Gylys-Colwell
40e2e7fa08
Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 51cf7e4668
...
Change-Id: I5e835996ad9f0290572d3da4c2106a4e5739c790
2020-05-21 22:54:18 +00:00
Fred Gylys-Colwell
0a165bbf44
Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122
...
Change-Id: Ia251d06305a373715303be4c315401552e8d44f9
2020-05-21 22:41:23 +00:00
Fred Gylys-Colwell
88ef970b90
Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d
...
Change-Id: I3cb29d5429ba53accf3709303df2f59cd2ef86f7
2020-05-21 22:41:21 +00:00
Fred Gylys-Colwell
51cf7e4668
Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d
...
Change-Id: Ifc0acc1b95a25f071bafdaf6474bdadfe594a483
2020-05-21 22:41:00 +00:00
Fred Gylys-Colwell
d22ef11122
Update TimeRollbackPrevention unit test am: 75575418d0
...
Change-Id: I1a0345208fcbce3a03798d9641725a67f218ea6f
2020-05-21 22:29:15 +00:00
