OSDN Git Service
Adam Seaton [Thu, 18 Aug 2016 22:04:24 +0000 (22:04 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev
am:
5c021503c6
Change-Id: I8f6b62b6ed8e5170b6558d7d21155f3e31665b6a
Adam Seaton [Thu, 18 Aug 2016 22:04:24 +0000 (22:04 +0000)]
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
am:
bb45bd20e9
Change-Id: I72826f39c7c5db303106694fd41927e09f1c86d7
Adam Seaton [Thu, 18 Aug 2016 21:58:58 +0000 (21:58 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev
Adam Seaton [Thu, 18 Aug 2016 21:41:45 +0000 (21:41 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours
am:
002effed6c
Change-Id: Ibc35d4abfc195e81f8488b3f9b6e3f5d939d6af2
Adam Seaton [Thu, 18 Aug 2016 21:38:45 +0000 (21:38 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350
am:
aa38670685 -s ours
Change-Id: I9eaf2e0e1674b113a51098b8442f634e7da64f7f
Adam Seaton [Thu, 18 Aug 2016 21:35:45 +0000 (21:35 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours
am:
498e9543af
Change-Id: I48d4d237da43a37535c8061e7c6fabeb9009aebe
Adam Seaton [Thu, 18 Aug 2016 21:32:13 +0000 (21:32 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46
am:
8cf402ace2 -s ours
Change-Id: I7814fa4d5394fd747fc5674a8a044a127c92d049
Adam Seaton [Thu, 18 Aug 2016 21:11:04 +0000 (14:11 -0700)]
Update Security String to 2016-10-05 to Platform and CTS for October
Security Updates (rebased)
b/
30946906
Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
Adam Seaton [Thu, 18 Aug 2016 21:02:37 +0000 (21:02 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c
am:
d2c5aaf350
Change-Id: I03f0476f3bf42fe67ec77d657cc046841fae19e6
Adam Seaton [Thu, 18 Aug 2016 21:01:43 +0000 (21:01 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October Security
am:
cb60b2dedb
Change-Id: Ibab3f4e47e05a2ec708105ddc3824df83ea95458
Adam Seaton [Thu, 18 Aug 2016 20:58:41 +0000 (20:58 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264
am:
35419f227c
Change-Id: I0dfedcac1afc572d41f04c80720b5ea0b9f991f4
Adam Seaton [Thu, 18 Aug 2016 20:52:11 +0000 (20:52 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47
am:
ef7c757264
Change-Id: I213a8678acce680ff12341023ea7e653dddb9b71
Adam Seaton [Thu, 18 Aug 2016 20:49:10 +0000 (20:49 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c
am:
6bf8893f47
Change-Id: I3f0fe988dd4f25942972335a2f4c0987ff519e97
Adam Seaton [Thu, 18 Aug 2016 20:45:40 +0000 (20:45 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a
am:
4e53c17e7c
Change-Id: I66f35a8c156f893d3eda8d4f0ad00af4e5831eef
Adam Seaton [Thu, 18 Aug 2016 20:42:39 +0000 (20:42 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security
am:
5da5be6a6a
Change-Id: Ic2356af128f6acb376403bac689b28ab94335ff4
Adam Seaton [Thu, 18 Aug 2016 18:33:49 +0000 (18:33 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3
am:
01262bec46
Change-Id: I5902c6e7898bf961d0c1d61fe68d411291d9a14c
Adam Seaton [Thu, 18 Aug 2016 18:31:26 +0000 (11:31 -0700)]
Update Security String to 2016-10-05 to platform and CTS for October
Security
b/
30946906
Change-Id: I7be961202245aa93a5e72e19cb39064b7675bf95
Adam Seaton [Thu, 18 Aug 2016 18:30:01 +0000 (18:30 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6
am:
143bd253d3
Change-Id: Id1c63d9fcc98c2f708601ea1e7b8b6ed3aeb9c40
Adam Seaton [Thu, 18 Aug 2016 18:27:00 +0000 (18:27 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588
am:
4739db2df6
Change-Id: I0debb51e5b85691189e481cb80eb756e7bf158a8
Adam Seaton [Thu, 18 Aug 2016 18:24:00 +0000 (18:24 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709
am:
3920471588
Change-Id: Ic6ba2917a9345601502050c76f0b2208eba24b66
Adam Seaton [Thu, 18 Aug 2016 18:20:59 +0000 (18:20 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024
am:
985a8b2709
Change-Id: I18be5d0228c07d3f1b836f1f92d63538bef96f88
Adam Seaton [Thu, 18 Aug 2016 18:18:00 +0000 (18:18 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October
am:
3e6d6b3024
Change-Id: Ia61e8d85659152cdbdd2786c6651753e00e762f1
Adam Seaton [Thu, 18 Aug 2016 17:33:30 +0000 (10:33 -0700)]
Update Security String to 2016-10-01 to platform and CTS for October Security
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
Adam Seaton [Thu, 18 Aug 2016 17:19:10 +0000 (10:19 -0700)]
Update Security String to 2016-10-01 to platform and CTS for October
Change-Id: If6d3cd562ceff218136185cd16b52ab92ed8d0f2
Adam Seaton [Fri, 12 Aug 2016 21:14:53 +0000 (21:14 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours
am:
cdbdfcdbd5
Change-Id: Ic0300b3b3018dc08277ddc0398143ae8bcbd0fbc
Adam Seaton [Fri, 12 Aug 2016 21:10:44 +0000 (21:10 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31
am:
d5c59f3b97 -s ours
Change-Id: Ibcf2cb117de238fa76e0551fd97a12d88200e30d
Adam Seaton [Thu, 11 Aug 2016 21:41:45 +0000 (21:41 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am:
fa721839b2
Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
Adam Seaton [Thu, 11 Aug 2016 19:39:25 +0000 (12:39 -0700)]
Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)
Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
Adam Seaton [Mon, 8 Aug 2016 23:57:10 +0000 (23:57 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3
am:
a14e8c2f31
Change-Id: I471611e0996ab801d105a392fafbb8c1008c3350
Adam Seaton [Mon, 8 Aug 2016 23:54:06 +0000 (23:54 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe
am:
f63dfac0e3
Change-Id: I02999f460037cf8b6353c7be86c58459e8226efc
Adam Seaton [Mon, 8 Aug 2016 23:51:35 +0000 (23:51 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667
am:
48e00645fe
Change-Id: I284881c64f9370598434871634a7fc7794bc6581
Adam Seaton [Mon, 8 Aug 2016 23:48:10 +0000 (23:48 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin
am:
a53b868e6e
Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
Adam Seaton [Mon, 8 Aug 2016 23:48:05 +0000 (23:48 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5
am:
5ed4043667
Change-Id: I14818a4b4220874c816fbe9dc1d150b598f030e5
Adam Seaton [Mon, 8 Aug 2016 23:45:04 +0000 (23:45 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f
am:
637fa9c4c5
Change-Id: I8f5459266c69eddf11101f9be3a46beecdc71dad
Adam Seaton [Mon, 8 Aug 2016 23:42:34 +0000 (23:42 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin
am:
cc5148493f
Change-Id: Ib5a5e433d0a94040a4261dae9555606c34d18e81
Adam Seaton [Mon, 8 Aug 2016 22:08:45 +0000 (15:08 -0700)]
Update Security String to 2016-09-07 to platform and CTS for September
respin
Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
Adam Seaton [Mon, 8 Aug 2016 21:59:46 +0000 (14:59 -0700)]
Update security string to 2016-09-07 to platform and CTS for September
respin
Change-Id: I0f753925387a19fa055efd08ce026ef98431ef03
Adam Seaton [Thu, 28 Jul 2016 22:47:09 +0000 (22:47 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197 am:
ed2fbe64ff -s ours
am:
41a8f2bd55
Change-Id: I2262c1a520c31d3c6ef94866c0e30f5ad9cb4ed2
Adam Seaton [Thu, 28 Jul 2016 22:44:37 +0000 (22:44 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197
am:
ed2fbe64ff -s ours
Change-Id: I898a77183877016cc9411a5d124548c4d60d2b26
Adam Seaton [Thu, 28 Jul 2016 22:36:12 +0000 (22:36 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d
am:
8118421197
Change-Id: I6193353b95e616370adbfa2618d568073f167790
Adam Seaton [Thu, 28 Jul 2016 22:34:11 +0000 (22:34 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c
am:
d6eb8a739d
Change-Id: Ia2aeb08f9cb030048320beb6f5e0d625ff8b0b42
Adam Seaton [Thu, 28 Jul 2016 22:31:12 +0000 (22:31 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c
am:
a96455528c
Change-Id: I019d3216bafbbba0158ddd9ff93f0d8edbd7c40c
Adam Seaton [Thu, 28 Jul 2016 22:28:42 +0000 (22:28 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b
am:
a08cbbb97c
Change-Id: Ic0c7a50458cf9967baace9f3a46a5f61013b663d
Adam Seaton [Thu, 28 Jul 2016 22:25:45 +0000 (22:25 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a
am:
48e360c73b
Change-Id: Id53bea6c0a355d54c461b987e5a992c9211e6d32
Adam Seaton [Thu, 28 Jul 2016 22:23:40 +0000 (22:23 +0000)]
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev
am:
525c6aa541
Change-Id: I53403552530c0c449e3cd7f1afa59a9853712e88
Adam Seaton [Thu, 28 Jul 2016 22:23:06 +0000 (22:23 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278
am:
a234c54e2a
Change-Id: Icef9c0d868b8658faf79aabc99a811e0b715c362
Adam Seaton [Thu, 28 Jul 2016 21:16:34 +0000 (14:16 -0700)]
Updating security string to 2016-09-05 to platform and CTS in preparation
for 2016 September OTA on mnc-dev
b/
30224278
Change-Id: I0f0591b7f0f033320de422c4019e056231228539
Adam Seaton [Thu, 28 Jul 2016 21:09:57 +0000 (14:09 -0700)]
Updating security string to 2016-09-05 in preparation for 2016 September
OTA for b/
30224278
Change-Id: I055d0cc3a1a5f640dabf7a404c70c317e57959ca
Zach Jang [Wed, 20 Jul 2016 18:14:48 +0000 (18:14 +0000)]
Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
am:
cb4ba4c90c
Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3
Zach Jang [Wed, 20 Jul 2016 18:11:18 +0000 (18:11 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours
am:
f1be3289ff
Change-Id: I6f093b1be27f18d1d3aea0c44c031cf6c0d67d2d
Zach Jang [Wed, 20 Jul 2016 18:09:44 +0000 (18:09 +0000)]
Merge "Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA" into mnc-dev
Zach Jang [Wed, 20 Jul 2016 18:08:46 +0000 (18:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a
am:
2c64061e72 -s ours
Change-Id: I134b3a61251b175b01c21ee11997cf85e131308f
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Bug:
30222185
Bug:
30249120
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
(cherry picked from commit
ec99604b07132358b92bb053777b4db6a0ae0223)
Zach Jang [Wed, 20 Jul 2016 01:14:11 +0000 (01:14 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5
am:
984987506a
Change-Id: Icce72413eaf703145c4e0478926839476df79588
Zach Jang [Wed, 20 Jul 2016 01:10:46 +0000 (01:10 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8
am:
46a86bf9d5
Change-Id: If879ae7d694caa588554628a4fff3558009aa694
Zach Jang [Wed, 20 Jul 2016 01:08:10 +0000 (01:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f
am:
c8b3df9fb8
Change-Id: Ie46aa33c4d927bed0024887c3ef59f45f516e3f9
Zach Jang [Wed, 20 Jul 2016 01:05:41 +0000 (01:05 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879
am:
d46066851f
Change-Id: Ibfe7fbdbfa81f053a5dd4082a8ebb403e7c57930
Zach Jang [Wed, 20 Jul 2016 01:02:41 +0000 (01:02 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d
am:
5e9c40c879
Change-Id: I8405b34a45cf8d0a0dc16bfc6b216f5c66b7f6ba
Zach Jang [Wed, 20 Jul 2016 01:00:09 +0000 (01:00 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
am:
4d7c3a4c0d
Change-Id: I848cd6c2068f54c54a53dc5d0bb35c54fc7eb23f
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Zach Jang [Mon, 20 Jun 2016 21:30:52 +0000 (14:30 -0700)]
Updating security string to 2016-08-05
b/
29513589
Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit
f2ac912b19ccbcc15d5176ec52c99744810adce7)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev
Revert "Add system/extras/verity/build_verity_metadata.py to otatools"
Bug:
29008004
This reverts commit
d26a99c3c6903c02c5435ec5f0123f057527b0a9.
Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py to otatools
Bug:
29008004
Zach Jang [Wed, 25 May 2016 20:44:22 +0000 (20:44 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0
am:
bf5d08ecf4
* commit '
bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
Updating security string to 2016-07-05
Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
Zach Jang [Wed, 25 May 2016 20:39:28 +0000 (20:39 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad
am:
7cc20fe0a0
* commit '
7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
Updating security string to 2016-07-05
Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
Zach Jang [Wed, 25 May 2016 20:34:47 +0000 (20:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours
am:
4c9d484078
* commit '
4c9d484078d45bef09147e5beaf475f9aba96eb4':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: If826c11507df71dc36228d0b5b845078080e37a2
Zach Jang [Wed, 25 May 2016 20:34:46 +0000 (20:34 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f
am:
e7660e56ad
* commit '
e7660e56ad330c8469857014c448130143c86856':
Updating security string to 2016-07-05
Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
Zach Jang [Wed, 25 May 2016 20:30:15 +0000 (20:30 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4
am:
afbf826576 -s ours
* commit '
afbf826576540aa15310d018235f90f8cfd6c6fc':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d
Zach Jang [Wed, 25 May 2016 20:30:14 +0000 (20:30 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am:
ab6c08949f
* commit '
ab6c08949f2a96867b1eda536eeb74982a49d5d3':
Updating security string to 2016-07-05
Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
Zach Jang [Wed, 25 May 2016 20:25:14 +0000 (20:25 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff
am:
e496a955f4
* commit '
e496a955f40fafb3073f7aef8be89c704ce0f01c':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:20:57 +0000 (20:20 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours
am:
1fc50f59ff
* commit '
1fc50f59ff732131122d8fbcdbb497561e434364':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63
Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours
am:
79770b1927 -s ours
* commit '
79770b192771b7e332f1537fef3e3719b07bcf14':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc
Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a
am:
60270ec785 -s ours
* commit '
60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ia89f4840478991109628844f889e6c97677b0d50
Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375
am:
555c5af89a
* commit '
555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]
DO NOT MERGE Updating security string to 2016-07-05
am:
f885e95375
* commit '
f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]
DO NOT MERGE Updating security string to 2016-07-05
b/
28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05
b/
28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
Zach Jang [Tue, 24 May 2016 01:22:07 +0000 (01:22 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours
am:
9ae8c7356e
* commit '
9ae8c7356efd1eadb9e4043d96cc5dc28ba554b6':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I67fe439474ce9edd47194a926719b71b846a2a56
Zach Jang [Tue, 24 May 2016 01:19:37 +0000 (01:19 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7
am:
8ebaeae1f6 -s ours
* commit '
8ebaeae1f6f0a69fc1bf518558fa463ed0cca6de':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I07650552a45e5e2de1524b43839c895283d17c4a
Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b
am:
3cba9b15f7
* commit '
3cba9b15f7ce25e194a305d37d27424e6923fd4b':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ib7e12ebb1a9140084a1e3aa28cede2809499004e
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours
am:
8b961c808b
* commit '
8b961c808b6c67d464f4c070ea46b8a0650595d5':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Id5916f2fa84a2fee99a37a1a8b9fd07d8c58ae0b
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours
am:
e495d379de -s ours
* commit '
e495d379decdfea93789c4693dd0f96aac23c34d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d
am:
3e082f1e64
* commit '
3e082f1e649821f00ec751824e901f64a2756269':
Updating security string to 2016-07-01
Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5
Zach Jang [Tue, 24 May 2016 01:09:15 +0000 (01:09 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78
am:
0b4608ca4d
* commit '
0b4608ca4d8b10af335f839350a4224a198e8dee':
Updating security string to 2016-07-01
Change-Id: I08d096476c645d304ab5038cd5ca586073424157
Zach Jang [Tue, 24 May 2016 01:09:14 +0000 (01:09 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3
am:
2ee84bf0a5 -s ours
* commit '
2ee84bf0a56984323154411d60096b691c66b841':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01
am:
0bdac8fba3
* commit '
0bdac8fba335f4e1620871bf5082dbebc55a497d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f
OSDN Git Service
