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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]

resolve merge conflicts of 24cfbfa to lmp-dev

Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]

Updating security string to 2016-07-01 am: 45ff24a04b
am: 1dd3095e78

* commit '1dd3095e780dc83aa1b4056f298a4678bead075a':
Updating security string to 2016-07-01

Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:02:06 +0000 (01:02 +0000)]

Updating security string to 2016-07-01
am: 45ff24a04b

* commit '45ff24a04bd5d3af706ae3aa6266106560070a3d':
Updating security string to 2016-07-01

Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:02:05 +0000 (01:02 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
am: 89f6f7aa01

* commit '89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62

commit | commitdiff | tree

Zach Jang [Mon, 23 May 2016 20:26:32 +0000 (13:26 -0700)]

Updating security string to 2016-07-01

b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1

commit | commitdiff | tree

Zach Jang [Mon, 23 May 2016 20:19:30 +0000 (13:19 -0700)]

DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]

Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 18:43:25 +0000 (18:43 +0000)]

Add Oem Props to otatools package
am: 4f8df41cef

* commit '4f8df41ceff7434ece651737b15bf1035f5549e8':
Add Oem Props to otatools package

Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]

Add Oem Props to otatools package

Bug: 23967152

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours
am: d28e7ea333  -s ours

* commit 'd28e7ea333986fe820f19f2b34dec074f3b8bc22':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am: f193546d65 -s ours

* commit 'f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 19:50:19 +0000 (19:50 +0000)]

Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757

* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01

Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 18:49:54 +0000 (18:49 +0000)]

Update security patch string to 2016-06-01
am: 0a3b3d4

* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a

commit | commitdiff | tree

Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]

Update security patch string to 2016-06-01

b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 00:53:20 +0000 (00:53 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780
am: 274e483

* commit '274e48378f92c711d28876380f34e263159cb81b':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 00:49:48 +0000 (00:49 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am: 175b780

* commit '175b7800f484edceee404abf21973859d5793c0d':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:48:45 +0000 (00:48 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5
am: df28b90

* commit 'df28b90a7c45a02c4ba9896ad89f745a48fac7df':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:45:26 +0000 (00:45 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am: 2b71be5

* commit '2b71be536b6de0d16d0ae3224d1b00c41bec467e':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:13:25 +0000 (00:13 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd

* commit 'cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:11:47 +0000 (17:11 -0700)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805

b/27724967

Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:10:53 +0000 (00:10 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am: 7a498ba

* commit '7a498bafff136f1996042c6794ababcaff11d600':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:04:32 +0000 (17:04 -0700)]

Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2

b/27724091

Change-Id: If448a426d78388208e15254ef30b42873a729647

commit | commitdiff | tree

Zach Jang [Fri, 19 Feb 2016 22:06:14 +0000 (22:06 +0000)]

Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
Updating security string patch to 2016-04-01

commit | commitdiff | tree

Zach Jang [Fri, 19 Feb 2016 22:00:21 +0000 (22:00 +0000)]

Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
Updating security string patch to 2016-04-01

commit | commitdiff | tree

Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]

Updating security string patch to 2016-04-01

b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e

commit | commitdiff | tree

Zach Jang [Tue, 12 Jan 2016 01:26:41 +0000 (01:26 +0000)]

Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e

* commit '293887c43ee5b797f8628f5983f64bf766002009':
Updating security patch string to 2016-03-01

commit | commitdiff | tree

Zach Jang [Tue, 12 Jan 2016 01:24:55 +0000 (01:24 +0000)]

Updating security patch string to 2016-03-01
am: c24c6ccd4d

* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
Updating security patch string to 2016-03-01

commit | commitdiff | tree

Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]

Updating security patch string to 2016-03-01

b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733

commit | commitdiff | tree

Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]

DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b
am: af970fb308

* commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617':
DO NOT MERGE - Update security string to 2016-02-01

commit | commitdiff | tree

Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]

DO NOT MERGE - Update security string to 2016-02-01
am: 929a4abd2b

* commit '929a4abd2b777715bc730593aee87643a30706d6':
DO NOT MERGE - Update security string to 2016-02-01

commit | commitdiff | tree

Zach Jang [Wed, 9 Dec 2015 22:45:57 +0000 (14:45 -0800)]

DO NOT MERGE - Update security string to 2016-02-01

b/26110717

Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc

commit | commitdiff | tree

Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]

Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad
am: 645f200ae8

* commit '645f200ae8708414d06618989328dc3e3c84a917':
Update Security String to 2016-01-01 - DO NOT MERGE

commit | commitdiff | tree

Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]

Update Security String to 2016-01-01 - DO NOT MERGE
am: 58cdbdc5ad

* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
Update Security String to 2016-01-01 - DO NOT MERGE

commit | commitdiff | tree

Zach Jang [Fri, 20 Nov 2015 22:32:09 +0000 (14:32 -0800)]

Update Security String to 2016-01-01 - DO NOT MERGE

http://b/25819582

Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7

commit | commitdiff | tree

Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]

Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8
am: cc9ac27157

* commit 'cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE

commit | commitdiff | tree

Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]

Update security string to 2015-12-01 - DO NOT MERGE
am: 6575d4a2a8

* commit '6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE

commit | commitdiff | tree

Zach Jang [Thu, 22 Oct 2015 22:00:30 +0000 (15:00 -0700)]

Update security string to 2015-12-01 - DO NOT MERGE

Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0

commit | commitdiff | tree

Zach Jang [Mon, 21 Sep 2015 21:06:10 +0000 (21:06 +0000)]

am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '0961150929c775a439f31b8c4fb35ba6a03c6f08':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Mon, 21 Sep 2015 20:00:04 +0000 (13:00 -0700)]

resolved conflicts for b161297d to lmp-mr1-ub-dev

Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e

commit | commitdiff | tree

Zach Jang [Mon, 21 Sep 2015 19:05:35 +0000 (19:05 +0000)]

am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '63712481f04b6525288b5df182d6f3e853a3bfb9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Mon, 21 Sep 2015 19:05:33 +0000 (19:05 +0000)]

am ab095b44: am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit 'ab095b445af361911df2856e77f43c4cf103a0e2':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Mon, 21 Sep 2015 18:58:22 +0000 (18:58 +0000)]

am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit 'bb97ff5941b266639e31fd4a30a6d34921e7bc2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Mon, 21 Sep 2015 18:58:10 +0000 (18:58 +0000)]

am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '48e2b43e8cc030456b0f625f321c45d2e1775130':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Thu, 17 Sep 2015 20:40:28 +0000 (20:40 +0000)]

am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit 'a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Thu, 17 Sep 2015 20:27:20 +0000 (20:27 +0000)]

am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit 'e539537d8c7a4288f40afa9226787b9af3d4416b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Thu, 17 Sep 2015 20:16:43 +0000 (20:16 +0000)]

am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]

am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '4c710cbe7f5786c3df396ea4283da920fd5c351b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Thu, 17 Sep 2015 20:04:17 +0000 (20:04 +0000)]

am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

* commit '47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

commit | commitdiff | tree

Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]

DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3

commit | commitdiff | tree

Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]

DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3

commit | commitdiff | tree

leozwang [Tue, 15 Sep 2015 07:41:53 +0000 (00:41 -0700)]

Fix build.

Convert ota_from_target_files back to symbolic link.

Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c

commit | commitdiff | tree

Leo Wang [Tue, 15 Sep 2015 04:36:53 +0000 (04:36 +0000)]

am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."

* commit '2c9dfb8239bb4cbe1c9118ccc5bd115713f513e6':
Revert "Add an option to include a full bootloader in incremental OTA."

commit | commitdiff | tree

Leo Wang [Tue, 15 Sep 2015 04:29:45 +0000 (04:29 +0000)]

am 1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."

* commit '1d4ad5158b2cf2f30269d8f733548188208af64a':
Revert "Add an option to include a full bootloader in incremental OTA."

commit | commitdiff | tree

Leo Wang [Tue, 15 Sep 2015 04:03:20 +0000 (04:03 +0000)]

Revert "Add an option to include a full bootloader in incremental OTA."

This reverts commit 46d5efcd0d451a48cc793931efef2b1ca982386d.

Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56

commit | commitdiff | tree

leozwang [Mon, 14 Sep 2015 23:39:23 +0000 (16:39 -0700)]

resolved conflicts for 00fdede3 to lmp-mr1-ub-dev

Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac

commit | commitdiff | tree

leozwang [Mon, 14 Sep 2015 21:27:04 +0000 (21:27 +0000)]

am 46d5efcd: Add an option to include a full bootloader in incremental OTA.

* commit '46d5efcd0d451a48cc793931efef2b1ca982386d':
Add an option to include a full bootloader in incremental OTA.

commit | commitdiff | tree

leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]

Add an option to include a full bootloader in incremental OTA.

Bug: 23101469
Bug: 23999213

Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca

commit | commitdiff | tree

Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]

resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev

Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b

commit | commitdiff | tree

Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]

am 473b6a5f: am fc028e59: Dist the otatools package.

* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.

commit | commitdiff | tree

Claes Elgemark [Wed, 26 Aug 2015 17:14:49 +0000 (17:14 +0000)]

am 8d771971: Don\'t fail build of otatools if there are no device certificates

* commit '8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates

commit | commitdiff | tree

Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]

Don't fail build of otatools if there are no device certificates

Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6

commit | commitdiff | tree

Tao Bao [Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)]

resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3

commit | commitdiff | tree

Ying Wang [Tue, 25 Aug 2015 18:21:13 +0000 (18:21 +0000)]

am fc028e59: Dist the otatools package.

* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.

commit | commitdiff | tree

Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]

Dist the otatools package.

Bug: 23495952

(cherry picked from commit 267e957373765ad1e3ce89abe61886a305277027)

Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788

commit | commitdiff | tree

Konstantinos Menychtas [Tue, 25 Aug 2015 17:20:11 +0000 (10:20 -0700)]

resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev

Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5

commit | commitdiff | tree

Doug Zongker [Tue, 25 Aug 2015 01:20:34 +0000 (01:20 +0000)]

am 32bf3f32: add otatools-package target

* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target

commit | commitdiff | tree

Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]

add otatools-package target

Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.

Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43efbc16c548692dc239a387edda15d78f)

commit | commitdiff | tree

Konstantinos Menychtas [Tue, 18 Aug 2015 20:19:10 +0000 (20:19 +0000)]

am dae79613: Increasing all emulator system image sizes

* commit 'dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes

commit | commitdiff | tree

Konstantinos Menychtas [Tue, 18 Aug 2015 17:27:04 +0000 (10:27 -0700)]

Increasing all emulator system image sizes

Size increase in system image deemed necessary after build
breakage observed on lmp-mr1-dev due to lack of space on
MIPS system image.

All system image sizes updated to match the image size
values set in MNC-dev (avoid merge conflicts, future-proof
all images against similar breakage issues).
This image size increase takes moderate space on host
device and does not affect system image download size
(images are sparse but delivered compressed anyway).

Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd

build

RSS Atom

About OSDN

Find Software

Develop Software

Help