Commits · cf51c6cb294f77029418c85d06d49f705d52ad13 · halo / build

22 Jun, 2016 5 commits
- resolve merge conflicts of 12db2242 to lmp-mr1-dev · cf51c6cb
  Zach Jang authored 8 years ago
```
am: 0c672afc

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
```
  cf51c6cb
- resolve merge conflicts of 12db2242 to lmp-mr1-dev · 0c672afc
  Zach Jang authored 8 years ago
```
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
```
  0c672afc
- resolve merge conflicts of 24cfbfab to lmp-dev · 12db2242
  Zach Jang authored 8 years ago
```
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
```
  12db2242
- Updating security string to 2016-08-05 am: 5b14c1f7 · 24cfbfab
  Zach Jang authored 8 years ago
```
am: 26acdf0c

Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
```
  24cfbfab
- Updating security string to 2016-08-05 · 26acdf0c
  Zach Jang authored 8 years ago
```
am: 5b14c1f7

Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
```
  26acdf0c
20 Jun, 2016 1 commit
- Updating security string to 2016-08-05 · 5b14c1f7
  Zach Jang authored 8 years ago
```
b/29513589

Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
```
  5b14c1f7
25 May, 2016 9 commits

Merge "Updating security string to 2016-07-05" into lmp-mr1-dev · e7660e56

Zach Jang authored 9 years ago

am: ab6c0894

* commit 'ab6c0894':
  Updating security string to 2016-07-05

Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8

e7660e56

Merge "Updating security string to 2016-07-05" into lmp-mr1-dev · ab6c0894
Zach Jang authored 9 years ago

ab6c0894

DO NOT MERGE Updating security string to 2016-07-05 am: am:... · e496a955

Zach Jang authored 9 years ago

DO NOT MERGE Updating security string to 2016-07-05 am: f885e953 am: 555c5af8 am: 60270ec7  -s ours am: 79770b19  -s ours
am: 1fc50f59

* commit '1fc50f59':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63

e496a955

DO NOT MERGE Updating security string to 2016-07-05 am: am:... · 1fc50f59

Zach Jang authored 9 years ago

DO NOT MERGE Updating security string to 2016-07-05 am: f885e953 am: 555c5af8 am: 60270ec7  -s ours
am: 79770b19  -s ours

* commit '79770b19':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc

1fc50f59

DO NOT MERGE Updating security string to 2016-07-05 am: am: · 79770b19

Zach Jang authored 9 years ago

am: 60270ec7  -s ours

* commit '60270ec7':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ia89f4840478991109628844f889e6c97677b0d50

79770b19

DO NOT MERGE Updating security string to 2016-07-05 am: · 60270ec7

Zach Jang authored 9 years ago

am: 555c5af8

* commit '555c5af8':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2

60270ec7

DO NOT MERGE Updating security string to 2016-07-05 · 555c5af8

Zach Jang authored 9 years ago

am: f885e953

* commit 'f885e953':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4

555c5af8

DO NOT MERGE Updating security string to 2016-07-05 · f885e953
Zach Jang authored 9 years ago
```
b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6
```
f885e953
Updating security string to 2016-07-05 · ea3b024d
Zach Jang authored 9 years ago
```
b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
```
ea3b024d

24 May, 2016 6 commits

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:... · 3cba9b15

Zach Jang authored 9 years ago

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa am: 0bdac8fb am: 2ee84bf0  -s ours am: e495d379  -s ours
am: 8b961c80

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

Change-Id: Id5916f2fa84a2fee99a37a1a8b9fd07d8c58ae0b

3cba9b15

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:... · 8b961c80

Zach Jang authored 9 years ago

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa am: 0bdac8fb am: 2ee84bf0  -s ours
am: e495d379  -s ours

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

Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54

8b961c80

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:... · e495d379

Zach Jang authored 9 years ago

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa am: 0bdac8fb
am: 2ee84bf0  -s ours

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

Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768

e495d379

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: · 2ee84bf0

Zach Jang authored 9 years ago

am: 0bdac8fb

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

Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f

2ee84bf0

Updating security string to 2016-07-01 · 1dd3095e

Zach Jang authored 9 years ago

am: 45ff24a0

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

Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4

1dd3095e

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

Zach Jang authored 9 years ago

am: 89f6f7aa

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

Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62

0bdac8fb

23 May, 2016 2 commits
- Updating security string to 2016-07-01 · 45ff24a0
  Zach Jang authored 9 years ago
```
b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
```
  45ff24a0
- DO NOT MERGE Updating security string to 2016-07-01 · 89f6f7aa
  Zach Jang authored 9 years ago
```
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
```
  89f6f7aa
20 May, 2016 2 commits
- Add Oem Props to otatools package · c1937df4
  Baligh Uddin authored 9 years ago
```
am: 4f8df41c

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

Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
```
  c1937df4
- Add Oem Props to otatools package · 4f8df41c
  Baligh Uddin authored 9 years ago
```
Bug: 23967152
```
  4f8df41c
12 May, 2016 2 commits

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

Baligh Uddin authored 9 years ago

am: f193546d  -s ours

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

Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418

d28e7ea3

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev · f193546d
Baligh Uddin authored 9 years ago
```
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
```
f193546d

20 Apr, 2016 1 commit

Update security patch string to 2016-06-01 · 0ca37573

Zach Jang authored 9 years ago

am: 0a3b3d40

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

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a

0ca37573

19 Apr, 2016 1 commit
- Update security patch string to 2016-06-01 · 0a3b3d40
  Zach Jang authored 9 years ago
```
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
```
  0a3b3d40
23 Mar, 2016 1 commit
- Update Security String to 2016-05-01 in preparation for May 2016 Security OTA · 274e4837
  Zach Jang authored 9 years ago
```
am: 175b7800

* commit '175b7800':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
```
  274e4837
22 Mar, 2016 2 commits

Update Security String to 2016-04-02 in preparation for April 2016 Security... · df28b90a

Zach Jang authored 9 years ago

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

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

df28b90a

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA · 175b7800
Zach Jang authored 9 years ago
```
b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
```
175b7800

18 Mar, 2016 3 commits
- Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 · 2b71be53
  Zach Jang authored 9 years ago
```
- kernel updates with patches for CVE-2015-1805

b/27724967

Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
```
  2b71be53
- Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 · cdbccfda
  Zach Jang authored 9 years ago
```
am: 7a498baf

* commit '7a498baf':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
```
  cdbccfda
- Updating Security Patch String to: 2016-03-18 · 7a498baf
  Zach Jang authored 9 years ago
```
- March 2016 OTA v2

b/27724091

Change-Id: If448a426d78388208e15254ef30b42873a729647
```
  7a498baf
19 Feb, 2016 2 commits
- Updating security string patch to 2016-04-01 · 054bbb97
  Zach Jang authored 9 years ago
```
am: e182d2a9

* commit 'e182d2a9':
  Updating security string patch to 2016-04-01
```
  054bbb97
- Updating security string patch to 2016-04-01 · e182d2a9
  Zach Jang authored 9 years ago
```
b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
```
  e182d2a9
12 Jan, 2016 2 commits
- Updating security patch string to 2016-03-01 · 293887c4
  Zach Jang authored 9 years ago
```
am: c24c6ccd

* commit 'c24c6ccd':
  Updating security patch string to 2016-03-01
```
  293887c4
- Updating security patch string to 2016-03-01 · c24c6ccd
  Zach Jang authored 9 years ago
```
b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
```
  c24c6ccd
09 Dec, 2015 1 commit
- DO NOT MERGE - Update security string to 2016-02-01 · af970fb3
  Zach Jang authored 9 years ago
```
am: 929a4abd

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