Zach Jang
8ebaeae1f6
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
2016-05-24 01:17:01 +00:00
Zach Jang
3cba9b15f7
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
2016-05-24 01:14:26 +00:00
Zach Jang
8b961c808b
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
2016-05-24 01:11:45 +00:00
Zach Jang
e495d379de
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
2016-05-24 01:09:14 +00:00
Zach Jang
0b4608ca4d
Updating security string to 2016-07-01 am: 45ff24a04b
...
am: 1dd3095e78
* commit '1dd3095e780dc83aa1b4056f298a4678bead075a':
Updating security string to 2016-07-01
Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
2016-05-24 01:06:37 +00:00
Zach Jang
2ee84bf0a5
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
2016-05-24 01:06:37 +00:00
Zach Jang
1dd3095e78
Updating security string to 2016-07-01
...
am: 45ff24a04b
* commit '45ff24a04bd5d3af706ae3aa6266106560070a3d':
Updating security string to 2016-07-01
Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
2016-05-24 01:02:06 +00:00
Zach Jang
0bdac8fba3
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
2016-05-24 01:02:05 +00:00
Zach Jang
45ff24a04b
Updating security string to 2016-07-01
...
b/28912173
Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
2016-05-23 13:26:32 -07:00
Zach Jang
89f6f7aa01
DO NOT MERGE Updating security string to 2016-07-01
...
- for klp-dev only
b/28912173
Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
2016-05-23 13:19:30 -07:00
Baligh Uddin
50cae53b10
Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev
2016-05-20 16:44:27 -07:00
Baligh Uddin
c1937df4b1
Add Oem Props to otatools package
...
am: 4f8df41cef
* commit '4f8df41ceff7434ece651737b15bf1035f5549e8':
Add Oem Props to otatools package
Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
2016-05-20 18:43:25 +00:00
Baligh Uddin
4f8df41cef
Add Oem Props to otatools package
...
Bug: 23967152
2016-05-20 11:29:53 -07:00
Baligh Uddin
e038da17f3
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
2016-05-12 23:08:02 +00:00
Baligh Uddin
d28e7ea333
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
2016-05-12 23:05:19 +00:00
Baligh Uddin
f193546d65
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
...
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
2016-05-12 15:55:26 -07:00
Zach Jang
05a8c77e42
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
2016-04-20 19:50:19 +00:00
Zach Jang
0ca37573e5
Update security patch string to 2016-06-01
...
am: 0a3b3d4
* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
2016-04-20 18:49:54 +00:00
Zach Jang
0a3b3d40c1
Update security patch string to 2016-06-01
...
b/28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
Zach Jang
08d9bea410
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
2016-03-23 00:53:20 +00:00
Zach Jang
274e48378f
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
2016-03-23 00:49:48 +00:00
Zach Jang
b90d09439a
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
2016-03-22 00:48:45 +00:00
Zach Jang
df28b90a7c
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
2016-03-22 00:45:26 +00:00
Zach Jang
175b7800f4
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
...
b/27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
2016-03-21 17:42:55 -07:00
Zach Jang
5b24724ccf
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
2016-03-18 00:13:25 +00:00
Zach Jang
2b71be536b
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
2016-03-17 17:11:47 -07:00
Zach Jang
cdbccfda83
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
2016-03-18 00:10:53 +00:00
Zach Jang
7a498bafff
Updating Security Patch String to: 2016-03-18
...
- March 2016 OTA v2
b/27724091
Change-Id: If448a426d78388208e15254ef30b42873a729647
2016-03-17 17:04:32 -07:00
Zach Jang
7e6a1633c8
Updating security string patch to 2016-04-01 am: e182d2a95c
...
am: 054bbb9766
* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
Updating security string patch to 2016-04-01
2016-02-19 22:06:14 +00:00
Zach Jang
054bbb9766
Updating security string patch to 2016-04-01
...
am: e182d2a95c
* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
Updating security string patch to 2016-04-01
2016-02-19 22:00:21 +00:00
Zach Jang
e182d2a95c
Updating security string patch to 2016-04-01
...
b/27272697
Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
2016-02-19 13:50:29 -08:00
Zach Jang
53e7d9bf7f
Updating security patch string to 2016-03-01 am: c24c6ccd4d
...
am: 293887c43e
* commit '293887c43ee5b797f8628f5983f64bf766002009':
Updating security patch string to 2016-03-01
2016-01-12 01:26:41 +00:00
Zach Jang
293887c43e
Updating security patch string to 2016-03-01
...
am: c24c6ccd4d
* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
Updating security patch string to 2016-03-01
2016-01-12 01:24:55 +00:00
Zach Jang
c24c6ccd4d
Updating security patch string to 2016-03-01
...
b/26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Zach Jang
41846b0063
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
2015-12-09 23:00:35 +00:00
Zach Jang
af970fb308
DO NOT MERGE - Update security string to 2016-02-01
...
am: 929a4abd2b
* commit '929a4abd2b777715bc730593aee87643a30706d6':
DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang
929a4abd2b
DO NOT MERGE - Update security string to 2016-02-01
...
b/26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09 14:45:57 -08:00
Zach Jang
2cd2a76c64
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
2015-11-21 00:55:17 +00:00
Zach Jang
645f200ae8
Update Security String to 2016-01-01 - DO NOT MERGE
...
am: 58cdbdc5ad
* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:51:39 +00:00
Zach Jang
58cdbdc5ad
Update Security String to 2016-01-01 - DO NOT MERGE
...
http://b/25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-20 22:54:48 +00:00
Zach Jang
fe64ce145e
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
2015-10-26 23:46:01 +00:00
Zach Jang
cc9ac27157
Update security string to 2015-12-01 - DO NOT MERGE
...
am: 6575d4a2a8
* commit '6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:42:57 +00:00
Zach Jang
6575d4a2a8
Update security string to 2015-12-01 - DO NOT MERGE
...
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
2015-10-22 15:00:30 -07:00
Zach Jang
ef02406452
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
2015-09-21 21:06:10 +00:00
Zach Jang
f694d37895
resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
2015-09-21 13:00:04 -07:00
Zach Jang
0961150929
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
2015-09-21 19:05:35 +00:00
Zach Jang
b161297d4b
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
2015-09-21 19:05:33 +00:00
Zach Jang
63712481f0
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
2015-09-21 18:58:22 +00:00
Zach Jang
ab095b445a
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
2015-09-21 18:58:10 +00:00
Zach Jang
bb97ff5941
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
2015-09-17 20:40:28 +00:00