Benoit Lamarche
0e61b46673
resolve merge conflicts of e04c941 to stage-aosp-master
...
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
2016-12-06 11:32:41 +01:00
Yohann Roussel
5360e0160b
Set platform min sdk for Jack to o-b1
...
Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)
Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
2016-12-02 08:36:24 +00:00
Akshay Thakker
d634094543
Set N-MR1 to version 7.1.1.
...
N-MR1 is based on NDR. It has the same API level (25) but includes a few
more bug fixes and is going out to all devices. Hence 7.1.1.
Bug: 31859390
Change-Id: Iaf864b183e90e1ee1503e24cc99ead504c67f147
2016-09-30 20:01:19 +00:00
Adam Seaton
a6071948d8
Updating security string to 2016-11-05 on nyc-dev
...
am: 002132648d
2016-09-21 17:55:12 +00:00
Adam Seaton
7d01908b3b
Updating Security String to 2016-11-01 on nyc-dev
...
am: 2a00b24144
2016-09-21 17:51:41 +00:00
Adam Seaton
002132648d
Updating security string to 2016-11-05 on nyc-dev
...
b/31618336
Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
2016-09-20 15:48:41 -07:00
Adam Seaton
2a00b24144
Updating Security String to 2016-11-01 on nyc-dev
...
b/31618336
Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
2016-09-20 15:47:16 -07:00
Adam Seaton
89c03f5748
Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
...
am: c63e4295ef
2016-08-26 03:11:47 +00:00
Adam Seaton
c63e4295ef
Update comments around PLATFORM_SECURITY_LEVEL
...
(nyc-dev)
Bug: 29881091
Change-Id: I2bdaf7f796ab94b14416aaed6d68dc3a239ea5f9
2016-08-25 19:46:06 -07:00
Adam Seaton
6e4a224227
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433
...
am: 68fede2142
2016-08-18 23:05:25 +00:00
Adam Seaton
4249783848
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831
...
am: 5d6ad4a9ab
2016-08-18 23:05:24 +00:00
Adam Seaton
68fede2142
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88
...
am: 35e3465433
2016-08-18 22:14:18 +00:00
Adam Seaton
eacfc7749b
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
...
am: bb45bd20e9
2016-08-18 22:04:24 +00:00
Adam Seaton
5d6ad4a9ab
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44
...
am: 7d5d729831
2016-08-18 21:12:43 +00:00
Adam Seaton
bb45bd20e9
Update Security String to 2016-10-05 to Platform and CTS for October
...
Security Updates (rebased)
b/30946906
Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
2016-08-18 14:11:04 -07:00
Adam Seaton
e977aadfea
Update Security String to 2016-10-01 to platform and CTS for October Security
...
am: cb60b2dedb
2016-08-18 21:01:43 +00:00
Adam Seaton
cb60b2dedb
Update Security String to 2016-10-01 to platform and CTS for October Security
...
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
2016-08-18 17:39:31 +00:00
Ian Pedowitz
6dfac06e2c
Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev
2016-08-15 17:24:24 +00:00
Adam Seaton
831bee139d
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
...
am: 782967785e
2016-08-11 21:55:18 +00:00
Adam Seaton
782967785e
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c
...
am: 1f85078b1e
2016-08-11 21:51:46 +00:00
Adam Seaton
fdf4c8d8a6
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
...
am: fa721839b2
2016-08-11 21:41:45 +00:00
Adam Seaton
fa721839b2
Update Security String to 2016-09-06 to platform and CTS for September
...
Security (+Quadrooter,-PZ)
Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
2016-08-11 12:39:25 -07:00
Ian Pedowitz
d0528b4463
N-DR/N-MR1 is 7.1
...
Bug: 30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
2016-08-09 16:44:23 -07:00
Adam Seaton
143faf4aa4
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
...
am: 2d033a9e51
2016-08-09 00:11:11 +00:00
Adam Seaton
2d033a9e51
Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5
...
am: f7de14b8a1
2016-08-09 00:05:36 +00:00
Adam Seaton
e158db8ad2
Update Security String to 2016-09-07 to platform and CTS for September respin
...
am: a53b868e6e
2016-08-08 23:48:10 +00:00
Adam Seaton
a53b868e6e
Update Security String to 2016-09-07 to platform and CTS for September
...
respin
Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
2016-08-08 15:08:45 -07:00
Adam Seaton
8d4fac76b5
Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH
...
Change-Id: Id4eeaedac02900df7e635f378b54c2e58e9b5c6e
2016-07-29 11:52:35 -07:00
Adam Seaton
bddec86ed9
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9
...
am: f25aadc812
2016-07-28 22:34:12 +00:00
Adam Seaton
f25aadc812
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7
...
am: 8736caaba9
2016-07-28 22:31:08 +00:00
Adam Seaton
63ec9d8f23
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev
...
am: 525c6aa541
2016-07-28 22:23:40 +00:00
Adam Seaton
525c6aa541
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
2016-07-28 21:21:06 +00:00
Zach Jang
a212b9c250
Merge \\\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1 am: 37688e09fb am: bf8d3a2105
...
am: 37c17db1c6
2016-07-21 15:27:58 +00:00
Zach Jang
37c17db1c6
Merge \\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1 am: 37688e09fb
...
am: bf8d3a2105
2016-07-21 15:21:00 +00:00
Zach Jang
942c341ab1
Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
...
am: cb4ba4c90c
2016-07-20 18:14:48 +00:00
Zach Jang
ee6b57f523
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
...
b/30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
2016-07-20 11:06:19 -07:00
Ian Pedowitz
14c2a1586b
Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev
2016-07-06 18:46:24 +00:00
Ian Pedowitz
3b54683924
Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
...
This reverts commit 266600b639
2016-07-05 18:25:14 +00:00
Michael Wright
bcdc880ca9
N MR1 is API 25
...
Bug: 29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
2016-07-01 14:42:44 +01:00
Ian Pedowitz
47383ac698
Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev
2016-06-24 17:53:00 +00:00
Ian Pedowitz
266600b639
Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""
...
This reverts commit 369efe3d84
2016-06-24 17:52:29 +00:00
Ian Pedowitz
7b352c1d70
Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev
2016-06-23 22:00:24 +00:00
Ian Pedowitz
369efe3d84
Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
...
This reverts commit dc15ebc26c
2016-06-23 19:09:46 +00:00
Zach Jang
113239bed6
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db am: 1be6c69524
...
am: 1f87a820ad
2016-06-22 01:46:17 +00:00
Zach Jang
1f87a820ad
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db
...
am: 1be6c69524
2016-06-22 01:43:47 +00:00
Zach Jang
3749025ccb
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94
...
am: 9fc3cf7ba2
2016-06-22 01:35:58 +00:00
Zach Jang
9fc3cf7ba2
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29
...
am: cbf1e2cc94
2016-06-22 01:33:23 +00:00
Zach Jang
0c672afc40
resolve merge conflicts of 12db224 to lmp-mr1-dev
...
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
2016-06-21 18:23:46 -07:00
Zach Jang
12db224269
resolve merge conflicts of 24cfbfa to lmp-dev
...
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
2016-06-21 18:13:17 -07:00
Zach Jang
24cfbfabb7
Updating security string to 2016-08-05 am: 5b14c1f7ce
...
am: 26acdf0c13
2016-06-22 00:44:33 +00:00
