Android Build Merger (Role)
|
f77f330af0
|
Merge "Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949" into oc-dr1-dev-plus-aosp am: a81104f2cf" into oc-mr1-dev-plus-aosp
|
2017-08-23 17:08:56 +00:00 |
|
Adam Seaton
|
8bb37d797d
|
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949" into oc-dr1-dev-plus-aosp
am: a81104f2cf
Change-Id: I1079e882543ae448596789f4b5df25a00153a78b
|
2017-08-23 17:08:36 +00:00 |
|
Android Build Merger (Role)
|
d77ffb15cd
|
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: bbcf3f0992 am: 8fda58deb4" into oc-mr1-dev-plus-aosp
|
2017-08-23 17:08:21 +00:00 |
|
Adam Seaton
|
9ef278d5e4
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: bbcf3f0992
am: 8fda58deb4
Change-Id: Ifb63cae4b77796700b9ac87c5cd849abc38520f3
|
2017-08-23 17:07:54 +00:00 |
|
Adam Seaton
|
59968542e3
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949
am: d463548af1
Change-Id: Ic1dbae77571fa5af08797683d000f1c2502e47fb
|
2017-08-23 17:07:48 +00:00 |
|
Android Build Merger (Role)
|
a81104f2cf
|
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949" into oc-dr1-dev-plus-aosp
|
2017-08-23 17:04:33 +00:00 |
|
Adam Seaton
|
d463548af1
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5
am: 269106b949
Change-Id: I02593920f447956a004461171665a497dfc550f9
|
2017-08-23 17:04:08 +00:00 |
|
Adam Seaton
|
2222ceab4d
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5
am: 269106b949
Change-Id: I527e6ce301180679e7f81822268979cc9261fdda
|
2017-08-23 17:04:06 +00:00 |
|
Adam Seaton
|
8fda58deb4
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5
am: bbcf3f0992
Change-Id: I33b7dbb55023aa49e32bda92dd7e0cf50e2fa134
|
2017-08-23 17:04:05 +00:00 |
|
Adam Seaton
|
269106b949
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours
am: cde553f1c5
Change-Id: Ie67c88fcd12874f4728637e3c6121a8500287f0a
|
2017-08-23 17:01:05 +00:00 |
|
Adam Seaton
|
bbcf3f0992
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours
am: cde553f1c5
Change-Id: I5d1948bcdfe214f48826597a5910d6913fe2e299
|
2017-08-23 17:01:05 +00:00 |
|
Adam Seaton
|
cde553f1c5
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b
am: e53cb97dcb -s ours
Change-Id: I7ba7c371d868bcfc306201ad225982893e5b2f40
|
2017-08-23 16:57:04 +00:00 |
|
Narayan Kamath
|
b5c7de2c6b
|
Merge "releasetools: Add support for compressed APKs." into oc-mr1-dev
am: 1d2518a649
Change-Id: If80c340c6680362568ad30866686b3a60047fa14
|
2017-08-23 14:28:53 +00:00 |
|
Narayan Kamath
|
1d2518a649
|
Merge "releasetools: Add support for compressed APKs." into oc-mr1-dev
|
2017-08-23 14:21:31 +00:00 |
|
Narayan Kamath
|
082d9d7cf5
|
Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856 am: 3d5dd6e4da
am: 5d8742482d
Change-Id: I6513a92f117a9231c3907bd97ea6f4335b662b6f
|
2017-08-23 09:59:40 +00:00 |
|
Narayan Kamath
|
5d8742482d
|
Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856
am: 3d5dd6e4da
Change-Id: Ib4fd1006385f5a4c70b3bcff7b9fb66ee753b732
|
2017-08-23 09:56:09 +00:00 |
|
Narayan Kamath
|
3d5dd6e4da
|
Merge "core: Fix typo in build rule." am: 665015ad17
am: 494e5fe856
Change-Id: I4be385b8cfe6506d6389596f14c545c14e25f87f
|
2017-08-23 09:52:39 +00:00 |
|
Narayan Kamath
|
494e5fe856
|
Merge "core: Fix typo in build rule."
am: 665015ad17
Change-Id: Ie66f22b18d3c4f6ae33a6a2bfdbe25e1069441fe
|
2017-08-23 09:47:07 +00:00 |
|
Narayan Kamath
|
665015ad17
|
Merge "core: Fix typo in build rule."
|
2017-08-23 09:40:12 +00:00 |
|
Dan Willemsen
|
664484189e
|
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5 am: 57385f5ff1
am: 377e870b9e
Change-Id: I7d20339c9f6b8203ecc42108f7d38a25c517161f
|
2017-08-23 02:08:38 +00:00 |
|
Dan Willemsen
|
377e870b9e
|
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5
am: 57385f5ff1
Change-Id: I44c20a2c3b51b4d33c3a09a192eef51059c543b4
|
2017-08-23 02:05:08 +00:00 |
|
Dan Willemsen
|
57385f5ff1
|
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d
am: f1c8fdede5
Change-Id: I344a2da1e195cadd53710173a14b68323404ca63
|
2017-08-23 02:02:25 +00:00 |
|
Dan Willemsen
|
f1c8fdede5
|
Merge "Split CleanSpec processing out of main Kati run"
am: acb4ace77d
Change-Id: I83a2bfafeff05423702d8886608c7ea91208b879
|
2017-08-23 02:00:13 +00:00 |
|
Treehugger Robot
|
acb4ace77d
|
Merge "Split CleanSpec processing out of main Kati run"
|
2017-08-23 01:53:59 +00:00 |
|
Android Build Merger (Role)
|
79d0a7ee1a
|
Merge "Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb am: b6a40fd0d8" into oc-mr1-dev-plus-aosp
|
2017-08-22 22:57:01 +00:00 |
|
Adam Seaton
|
32163af181
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb
am: b6a40fd0d8
Change-Id: I415f5940bab6d5ada6634323566eeb44de7c5769
|
2017-08-22 22:56:40 +00:00 |
|
Android Build Merger (Role)
|
57a4967789
|
Merge "Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb am: bf413aa70d" into oc-mr1-dev-plus-aosp
|
2017-08-22 22:56:38 +00:00 |
|
Adam Seaton
|
5934198f3a
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb
am: bf413aa70d
Change-Id: I96eca1c8515d215e6ef8580c4b93ff4801bd35fa
|
2017-08-22 22:55:36 +00:00 |
|
Android Build Merger (Role)
|
20db74b163
|
Merge "Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 834db8c201 am: 6cc9494d2c" into oc-mr1-dev-plus-aosp
|
2017-08-22 22:54:50 +00:00 |
|
Adam Seaton
|
c7def27186
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 834db8c201
am: 90b1c82d83
Change-Id: I02bc8ea1a0185241c77fb9ce54a5b166a4cd3fda
|
2017-08-22 22:53:25 +00:00 |
|
Adam Seaton
|
70b2f77eb4
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 834db8c201
am: 6cc9494d2c
Change-Id: I14c57342166df85cf823895944d6ebd0ade8a5c3
|
2017-08-22 22:53:23 +00:00 |
|
Adam Seaton
|
d8115fb4f9
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: ca22b203d0
am: 1b17813951
Change-Id: I9f2545f1f1c54edbaee396dc662111fa9b228769
|
2017-08-22 22:48:45 +00:00 |
|
Adam Seaton
|
b6a40fd0d8
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb
Change-Id: I02d8e80a0a71e3d0f1d68ef7e7337f262f609708
|
2017-08-22 22:48:26 +00:00 |
|
Adam Seaton
|
bf413aa70d
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb
Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
|
2017-08-22 22:48:23 +00:00 |
|
Adam Seaton
|
50bd0fa2cc
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 55b78726b4
am: 2174b6e355
Change-Id: If6ccc8963facaa0794f51b67718b7c2770e506e0
|
2017-08-22 22:48:10 +00:00 |
|
Adam Seaton
|
90b1c82d83
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201
Change-Id: I2acc807fc3b4fdaea5592ea0b885cb206284a211
|
2017-08-22 22:47:53 +00:00 |
|
Adam Seaton
|
6cc9494d2c
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201
Change-Id: Ice5d0d7b5e707aca945e1a05f6bf7b56a820a53f
|
2017-08-22 22:47:53 +00:00 |
|
Adam Seaton
|
1b17813951
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: ca22b203d0
Change-Id: I65b91c3e3acfa25af3792ddb86d9da418daaae8b
|
2017-08-22 22:41:59 +00:00 |
|
Adam Seaton
|
2174b6e355
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 55b78726b4
Change-Id: I2454bd68b62032987f67cf00aa02f246fa097325
|
2017-08-22 22:41:28 +00:00 |
|
Adam Seaton
|
f3ae135ddb
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74
Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
|
2017-08-22 22:37:48 +00:00 |
|
Adam Seaton
|
ca22b203d0
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74
Change-Id: I6b3fcb447c334206889a635178cda68f6bb20131
|
2017-08-22 22:37:09 +00:00 |
|
Adam Seaton
|
834db8c201
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000
Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
|
2017-08-22 22:37:00 +00:00 |
|
Adam Seaton
|
55b78726b4
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000
Change-Id: I56396b94ed83855dc0c0f86c99fffa46120b92eb
|
2017-08-22 22:36:22 +00:00 |
|
TreeHugger Robot
|
ce4bc47c74
|
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
|
2017-08-22 22:26:48 +00:00 |
|
TreeHugger Robot
|
fce94e0000
|
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
|
2017-08-22 22:26:42 +00:00 |
|
Dan Willemsen
|
514d49979c
|
Split CleanSpec processing out of main Kati run
Bug: 35970961
Test: m clean; m nothing; m nothing
Test: Add CleanSpec.mk line, see it executing
Change-Id: Ied59ac9dbcbeec00e1ada8271b1f66cae33edb8d
|
2017-08-22 13:08:24 -07:00 |
|
Adam Seaton
|
e53cb97dcb
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6
am: aed422e05b
Change-Id: Ifd6a64c599d045735f0c85595315679887310f18
|
2017-08-22 18:33:33 +00:00 |
|
Adam Seaton
|
aed422e05b
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524
am: dbe7ec01c6
Change-Id: Ic825ad705088aa62974c4a654b149f06f4b1f848
|
2017-08-22 18:31:34 +00:00 |
|
Adam Seaton
|
dbe7ec01c6
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
Change-Id: Ia70e8bd5134e5898dcd9cdf4482e534ade45c718
|
2017-08-22 18:29:02 +00:00 |
|
Adam Seaton
|
feada74524
|
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
am: e39fa5ef8f
Change-Id: I5918c7dfe27bb9b3c7aff031d79d961b08c3b711
|
2017-08-22 18:26:04 +00:00 |
|