git.osdn.net Git - android-x86/build.git/log

OSDN Git Service

(root) / android-x86 / build.git / log

commit | commitdiff | tree

Adam Seaton [Wed, 7 Jun 2017 21:53:03 +0000 (14:53 -0700)]

[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev
bug:62388772

commit | commitdiff | tree

Adam Seaton [Tue, 23 May 2017 20:27:58 +0000 (20:27 +0000)]

Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec
am: 16af70a949 -s ours

Change-Id: I716702080e330b73d3e343e892949e488b0f54be

commit | commitdiff | tree

Adam Seaton [Tue, 23 May 2017 17:36:16 +0000 (17:36 +0000)]

Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512
am: def58d6dec

Change-Id: I766d7eb612200e0ae9f6ae3eabf9bab92c152cb1

commit | commitdiff | tree

Adam Seaton [Tue, 23 May 2017 17:34:13 +0000 (17:34 +0000)]

Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360
am: f5c749c512

Change-Id: I363d1ce470f0d44caf1c12d4843d0f84a87b6f59

commit | commitdiff | tree

Adam Seaton [Tue, 23 May 2017 17:32:15 +0000 (17:32 +0000)]

Merge changes Id4d040ea,I318fb1fc into mnc-dev
am: a2603bd360

Change-Id: Ia22d1824913e82550dae44a799cb9da4c7344949

commit | commitdiff | tree

Adam Seaton [Tue, 23 May 2017 17:28:56 +0000 (17:28 +0000)]

Merge changes I46d9d8c1,I1ea15c14 into nyc-dev

* changes:
[DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695
[DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695

commit | commitdiff | tree

Adam Seaton [Tue, 23 May 2017 17:28:27 +0000 (17:28 +0000)]

Merge changes Id4d040ea,I318fb1fc into mnc-dev

* changes:
[DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev bug:38342695
[DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev bug:38342695

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:42:06 +0000 (19:42 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a
am: 5482ef4491 -s ours

Change-Id: I26bebc5e9dd4a3e04af3767970c323a310f1b16f

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:40:37 +0000 (19:40 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3
am: 90028cf69a

Change-Id: I8804295956083b6f6a8bf01b08ec8085b3e068d4

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:38:36 +0000 (19:38 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91
am: 5868fb70b3

Change-Id: I14f5bcd5373daa4b17d82f71bb873fef2b80ff12

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:36:37 +0000 (19:36 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours
am: 025c26de91

Change-Id: Iedb9b5e111975a9372d35f790464ff553d3c11d9

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:35:05 +0000 (19:35 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6
am: b3219be744 -s ours

Change-Id: Ifb51131e21dfb7fddc95d3514b494950e608af51

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:33:05 +0000 (19:33 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours
am: 05965e37e6

Change-Id: Ic1311cbf4fe550f7789f62588828299f8248518a

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:31:04 +0000 (19:31 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours
am: bf2d4968da -s ours

Change-Id: I5cd9534838910791e689a6659480d1862785ef10

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:29:29 +0000 (19:29 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d
am: e10ce80409 -s ours

Change-Id: I62e3792b2aef5064d04d488c5ca631d0a0631e58

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:29:04 +0000 (19:29 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2
am: ad8ec7f781 -s ours

Change-Id: I8b558f6db1b76d4169e10f78be020e8e605c0968

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:29:04 +0000 (19:29 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8
am: 3f5593376d -s ours

Change-Id: I7b94b0638f33d133ea45d69986ac853b613d4f44

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:27:37 +0000 (19:27 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231
am: 1899a63f1d

Change-Id: Ib018b81b77ca749333a4700049a525523e2f83c1

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:27:05 +0000 (19:27 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0
am: 535ade48f8

Change-Id: I3c084d863cb3b091c0e7ebf7783969c9c7125fa1

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:27:04 +0000 (19:27 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2

Change-Id: I18f6472f3d3bdc7af56c95b200213ad804c38039

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:26:00 +0000 (19:26 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd
am: 5c7bac6231

Change-Id: Idc1d79faa12fdd938f57e1678fbb34bbbc9c6bcd

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:25:36 +0000 (19:25 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c
am: 16dcd532a0

Change-Id: Ic6b017fd04b00a2cf65336e76386d94cabc8b13a

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:25:35 +0000 (19:25 +0000)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695
am: e2d22d501d

Change-Id: Ic8419e3d3b12a90173888aff21a11b18f2ed2bbb

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:22:26 +0000 (19:22 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours
am: 9f169ddbcd

Change-Id: I9d563934bf1454022707c9f55f4d97e92ce077d0

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:22:05 +0000 (19:22 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours
am: 7ad3c1407c

Change-Id: I8564bba5201302290fdca4d3350d0cbc7a97ac7b

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:19:01 +0000 (19:19 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73
am: 8a893de625 -s ours

Change-Id: I7407e2dd2411bc519a5499cf74c284c3fb74bdf0

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:18:33 +0000 (19:18 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909
am: ddac9519eb -s ours

Change-Id: Id563de5f09d1d033751273deb372cc9cc57e2c25

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:16:54 +0000 (19:16 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours
am: 4cfcc9fe73

Change-Id: I2f513d397ae199b0ea334d2254ae00a73e0b8026

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:16:34 +0000 (19:16 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours
am: 0a97d3f909

Change-Id: Id4cb1b9f7811a47a0c2781e54c0571e8d5eaca3f

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:14:57 +0000 (19:14 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
am: 11af5514df -s ours

Change-Id: If06ae105d14f94816787580e5146bfd38fc85126

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:14:34 +0000 (19:14 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev
am: 18fc68549b -s ours

Change-Id: Ib3882885ecaf352fc96578de1e5b12e1ae23a8c8

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:12:34 +0000 (19:12 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b
am: ad860c3d0d -s ours

Change-Id: Ia4e120c452a58d96125dd1263cd13809230e5f50

commit | commitdiff | tree

TreeHugger Robot [Fri, 19 May 2017 19:12:03 +0000 (19:12 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:10:34 +0000 (19:10 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6
am: 7d58605e6b

Change-Id: I517e0d561a688139c612b12168b19df9bd4db174

commit | commitdiff | tree

TreeHugger Robot [Fri, 19 May 2017 19:09:29 +0000 (19:09 +0000)]

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:09:04 +0000 (19:09 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd
am: 18e5f9b4f6

Change-Id: I80c6d7913223ff47d6943ddc1f3d509fb37f0afc

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:07:04 +0000 (19:07 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours
am: 2e17d83fcd

Change-Id: I61c5d7645d592863b1abd03057c2dd638aac9c50

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:05:32 +0000 (19:05 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81
am: d872742f52 -s ours

Change-Id: Ib653835d7a30261bd8080550c1078a504a3c6d18

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:03:33 +0000 (19:03 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours
am: a871e8ff81

Change-Id: I0c4e6ed39eaf707341be8af7c211764ee438855d

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:02:02 +0000 (19:02 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours
am: 387e0bb99a -s ours

Change-Id: Ic9f59110c95f7fbfae6250e6c9e174f0768df755

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 19:00:02 +0000 (19:00 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019
am: 652d99234a -s ours

Change-Id: I3d4e03afad44d825336403f23bf6ab79140e994b

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 18:58:32 +0000 (18:58 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019

Change-Id: Icc8d317d81e868b1f186f69e772d7bde628d80f7

commit | commitdiff | tree

Adam Seaton [Fri, 19 May 2017 18:56:32 +0000 (18:56 +0000)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695
am: 35d8838aec

Change-Id: I96a3e567b8a9388ad44aeef45ccda001ab81654b

commit | commitdiff | tree

Adam Seaton [Wed, 17 May 2017 18:27:05 +0000 (11:27 -0700)]

[DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Wed, 17 May 2017 18:24:52 +0000 (11:24 -0700)]

[DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Wed, 17 May 2017 18:14:27 +0000 (11:14 -0700)]

[DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Wed, 17 May 2017 18:12:31 +0000 (11:12 -0700)]

[DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Tue, 16 May 2017 18:50:22 +0000 (11:50 -0700)]

[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Tue, 16 May 2017 18:48:21 +0000 (11:48 -0700)]

[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Tue, 16 May 2017 18:10:11 +0000 (11:10 -0700)]

[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Tue, 16 May 2017 18:05:03 +0000 (11:05 -0700)]

[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev
bug:38342695

commit | commitdiff | tree

Adam Seaton [Thu, 13 Apr 2017 22:43:14 +0000 (22:43 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61
am: a34ba7f284

Change-Id: Ib1f877ea42a1603f7b53796997fb36600873bfee

commit | commitdiff | tree

Adam Seaton [Thu, 13 Apr 2017 22:43:09 +0000 (22:43 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01
am: 53980e19aa -s ours

Change-Id: If3de5b44ae34ef52a397f4480c556828354a4f9a

commit | commitdiff | tree

Adam Seaton [Thu, 13 Apr 2017 22:42:57 +0000 (22:42 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb
am: d8dbdc0809 -s ours

Change-Id: Id409cd89c262cb8b64b1141dfa6576f59786271c

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:29:53 +0000 (23:29 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50
am: d236029c61

Change-Id: I229eadd885c5a292ef0f7536b15d950251fdd3bb

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:29:47 +0000 (23:29 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9
am: 6e52769b01

Change-Id: Ie0a5aeb63c41a94b5bca5328a12e900feaa2f9b0

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:24:22 +0000 (23:24 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f
am: f84d2ddb50

Change-Id: I955feaeafb1b5a3fcc8238ca841465be5201b6ba

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:24:17 +0000 (23:24 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef
am: 5e089f6be9

Change-Id: I1b974dcf745c93238d1d5ae0c8e43e1d080f56c3

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:18:51 +0000 (23:18 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9
am: f73b5cbd1f

Change-Id: I4c70be454a8e8cda7ede3460f78e8f3579b7a566

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:18:46 +0000 (23:18 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours
am: b57f591fef

Change-Id: I1f240898b3911b48e3a1145e60ff317b8ef55475

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:13:21 +0000 (23:13 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1
am: 724c3d4bd9

Change-Id: Id141089035f48fd9548661af672d865b492b24b4

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:13:16 +0000 (23:13 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86
am: cf896d4bcb

Change-Id: Ib58f03f7346aa706508d9dc082c9661865478485

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:13:16 +0000 (23:13 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7
am: 13b453c917 -s ours

Change-Id: I0661e9917468d2d7dc21e48ef8ae511cff4dcba4

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:07:49 +0000 (23:07 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01
am: 12e0186aa1

Change-Id: Idf28d646ca10ff2724c213828c8f095dc4587f5a

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:07:46 +0000 (23:07 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:07:45 +0000 (23:07 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours
am: ff3f6e29e7

Change-Id: I353b3f3ed97e65d0db5f42409cb5229e42119e31

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:03:15 +0000 (23:03 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev
am: ea6878b926

Change-Id: I1fa56eef94ac1a5108303bc93b3a32ac48ec9e94

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:02:45 +0000 (23:02 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev
am: 9e63540d01

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 23:02:44 +0000 (23:02 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
am: 91a21e9d12 -s ours

Change-Id: Ia3faf06a43a8c39b5a021791d2a84460539a5eb3

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:50:45 +0000 (22:50 +0000)]

Merge changes Iee17fa80,Id9ee50be into lmp-dev

* changes:
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
[DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:49:42 +0000 (22:49 +0000)]

Merge changes I5c252cba,I80259eef into mnc-dev

* changes:
[DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
[DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:42:20 +0000 (22:42 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0
am: c4d46c791a -s ours

Change-Id: I7dbb4801b9d823e463a48734ba1c5d5ba0616bb4

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:42:15 +0000 (22:42 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c
am: a73f9cf1f5 -s ours

Change-Id: I2863a1477faf4c78b9e8f76dde98d2a1bba876c3

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:36:51 +0000 (22:36 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303
am: d1174126d0

Change-Id: I5cb4bb59b127239ef2c25d1dc1901b6f04a5c837

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:36:43 +0000 (22:36 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb
am: a34845a20c

Change-Id: I597322f70ca78e3632a59b6c0722b0fe3130a015

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:31:19 +0000 (22:31 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e
am: 47e5cb0303

Change-Id: Iff9d5d2ad014e7541b4369254671ca997d67fb61

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:31:13 +0000 (22:31 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3
am: 14ef6098bb

Change-Id: If78940c3c89e6bac35eb051bfa7908e03d18ee1a

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:26:47 +0000 (22:26 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours
am: 9a805d9e3e

Change-Id: I745302c0eb88b25169a03016bbf31962548723ef

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:26:42 +0000 (22:26 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours
am: 988fc368d3

Change-Id: Ice678f7c46970fe343208e5b793bbd362439192e

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:21:17 +0000 (22:21 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722
am: fa8973ba33 -s ours

Change-Id: Ib0e73771aa5d25dd0fac1e673f3fb10731476974

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:21:12 +0000 (22:21 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e
am: 18c3da68f0 -s ours

Change-Id: I5d27b65e5817456cab95468c7531f3621e95cb7d

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:16:46 +0000 (22:16 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours
am: 2d19cbf722

Change-Id: Ifebd5e3fd4f621ffaaa1b477fd0c90a72e855aad

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:16:42 +0000 (22:16 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours
am: 65101a958e

Change-Id: I523c87b067d7693b121242a73be982b4094e62bf

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:11:46 +0000 (22:11 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours
am: 2d14a7da35 -s ours

Change-Id: I98bf2f1ac4b53269f460846a522d7e13343df169

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:11:42 +0000 (22:11 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours
am: 4389a11f4b -s ours

Change-Id: I7470bfd4621f2281ee2bf03c8dd0fb0e80bba5e6

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:05:45 +0000 (22:05 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404
am: 89ebb51f6b -s ours

Change-Id: Iaf0beaf284058235ce55de23a99e5adae2a4eefd

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:05:41 +0000 (22:05 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07
am: 386d7ae2e8 -s ours

Change-Id: I272f3827ce226d1bde50e7391e288436277297c2

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:00:12 +0000 (22:00 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3
am: 35e82a6404

Change-Id: Idc0ff4956a850aab3130249eb8dacfc7451ce990

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 22:00:09 +0000 (22:00 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07

Change-Id: I3e236b94d24700299389ae02501ef8a232dad598

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 21:55:12 +0000 (21:55 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
am: c686e139b3

Change-Id: I4a0954f6f3f75841d7eb54c6c7073ae6642d1c2a

commit | commitdiff | tree

Adam Seaton [Wed, 12 Apr 2017 21:55:10 +0000 (21:55 +0000)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
am: e6a77de43b

Change-Id: I695b346d4769e30995ea91f0e864fd95afe4866a

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev

bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:58:30 +0000 (10:58 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev

bug:37204197
Change-Id: I5c252cba4fc0ad0d605218a71da91843256c4c64

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:52:20 +0000 (10:52 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev

bug:37204197
Change-Id: Iee17fa80c5c29b439bcbe85f11526a8b89247fdf

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 18:03:48 +0000 (11:03 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev

bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:57:44 +0000 (10:57 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev

bug:37204197
Change-Id: I80259eef1e7a0d0761d3bb31082b7b3606cef669

commit | commitdiff | tree

Adam Seaton [Tue, 11 Apr 2017 17:50:07 +0000 (10:50 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev

bug:37204197
Change-Id: Id9ee50bec46f2fd3f9e2e5f546c062f946bff36f

commit | commitdiff | tree

Adam Seaton [Mon, 10 Apr 2017 16:38:38 +0000 (09:38 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev

Bug:37204197
Change-Id: I797a8c6332a3bf62ba6ba9b17de9754e7cf5a902

commit | commitdiff | tree

Adam Seaton [Mon, 10 Apr 2017 16:36:42 +0000 (09:36 -0700)]

[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev

Bug:37204197
Change-Id: I7b0b5428c9b1f7ea7ab3a3e272689e6324dde8af

commit | commitdiff | tree

Tao Bao [Tue, 28 Feb 2017 19:48:48 +0000 (11:48 -0800)]

releasetools: Add support for --override_timestamp.

We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.

We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.

Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.

With the change in this CL:
- If it's a downgrade without any extra flag, fail the package
   generation (we only print warnings prior to this CL);
- If it's a downgrade with --downgrade flag, generate a downgrade
   package with forced data wipe (same as before);
- If it's a downgrade with --override_timestamp, generate a normal
   incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
   to avoid the manual change);
- If it's not a downgrade but with any of the above two flags specified,
   fail the package generation.

Bug: 33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
Merged-In: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
(cherry picked from commit 3e6161a3b33da5a46c80c79e2d815168923e83c3)

build

RSS Atom

About OSDN

Find Software

Develop Software

Help