History log of /build/core/version_defaults.mk
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f20c71f1909b7fca8d8b07d69481e04bae72cde3 07-Jun-2018 Adam Seaton <aseaton@google.com> Update Platform security string to 08-05 for August release
bug: 109889880
/build/make/core/version_defaults.mk
9b8b5854e80c6678e12a529018d3e0c9879c37a1 02-Jun-2018 Adam Seaton <aseaton@google.com> DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev
bug: 79883349
/build/make/core/version_defaults.mk
48bbb1ba67a9faee85f26dd359eae2f83d778ff0 29-May-2018 Tao Bao <tbao@google.com> Expose PLATFORM_SECURITY_PATCH_TIMESTAMP.

We have use case that uses the timestamp for PLATFORM_SECURITY_PATCH in
device specific Makefile, but need to handle the platform-dependent
`date` command. This CL computes and exposes
PLATFORM_SECURITY_PATCH_TIMESTAMP from the core build system.

Bug: 80311893
Test: Use PLATFORM_SECURITY_PATCH_TIMESTAMP in device-specific folder,
on both of Linux and macOS. Check the value.
Change-Id: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
Merged-In: I27a88dcebde7a1c204491f5f5c45c5160398dbb6
(cherry picked from commit 717d9d3ae2d2e8d000dad0eb0454658678b79f2f)
/build/make/core/version_defaults.mk
7bc3e17c055d65587c9d2bd27d23b5f75a026b0c 16-May-2018 Adam Seaton <aseaton@google.com> Merge "DO NOT MERGE: Updating security string for pi-dev to 2018-06-05" into pi-dev
23898eed9d396648072d67116e1a768ce0ac177b 04-May-2018 Ian Pedowitz <ijpedowitz@google.com> PLATFORM_PREVIEW_SDK_VERSION should be 0

It is already set to 0 because of REL, but explicitly set it

Bug: 77589980
Test: N/A
Change-Id: I97839c7dc09f8313f767635469f27b2a0d0e5010
/build/make/core/version_defaults.mk
9ab9fe762d1b67266bb5e367017f880cc37a0d74 01-May-2018 Ian Pedowitz <ijpedowitz@google.com> Merge "DO NOT MERGE: P is now REL" into pi-dev
43c6a65706b559dc0e149dc2e33d00b65b28d08f 27-Apr-2018 Jiyong Park <jiyong@google.com> Removed obsolete comment on PLATFORM_SYSTEMSDK_MIN_VERSION

The min version has been set.

Bug: 78023556
Test: no need
Change-Id: I12f816dfb9be7e9e945a68540f4efcfcc32b7cc2
/build/make/core/version_defaults.mk
88f3946e0e017823967049f87d77894d18787d0d 26-Apr-2018 Colin Cross <ccross@android.com> Set PLATFORM_SYSTEMSDK_MIN_VERSION := 28

In the temporary P-Finalization state, where PLATFORM_SDK_VERSION has
been incremented to 28 but PLATFORM_VERSION_CODENAME.PPR1 := P instead
of REL, PLATFORM_SYSTEMSDK_VERSIONS is still only P. Set
PLATFORM_SYSTEMSDK_MIN_VERSION := 28 so that PLATFORM_SYSTEMSDK_VERSIONS
is 28 P. Once PLATFORM_VERSION_CODENAME.PPR1 := REL it will become
just 28.

Bug: 78023556
Test: print PLATFORM_SYSTEMSDK_VERSIONS
Change-Id: I72cbef7bb7c84e6fd6fe4602021bb72d759d1b5e
/build/make/core/version_defaults.mk
f051d6def26a305d7a0f0252a1f112814a2435be 18-Apr-2018 Adam Seaton <aseaton@google.com> DO NOT MERGE: Updating security string for pi-dev to 2018-06-05

Bug:78240102
Change-Id: I3956e7b1b2e7035fa36b3ca74eccd0d4fffeee95
/build/make/core/version_defaults.mk
62e48ce1a4eb82ad7a00c716ad5b857b77f6ae9f 17-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update security string to 2018-05-05 on pi-dev Bug: 74345861" into pi-dev
2325d05510c5883ec182945c7ca4547fea5bf1ab 14-Apr-2018 Dan Chapin <chapin@google.com> DO NOT MERGE: P is now REL

Bug: 77589980
Test: Build
Change-Id: I27bf5cc01133ff8734ed959825b9ffaba3532449
/build/make/core/version_defaults.mk
07a54b7fba0bc5cf87918cdbeed8719257d77144 12-Apr-2018 Wale Ogunwale <ogunwale@google.com> Finalizing P SDK

Bug: 77588754
Test: builds
Merged-In: Iebb43a246016774150a3053f10bdedb0278b3e5d
Change-Id: Ied2e381795643aaf8c48e6c89d8ee66b8b5b15ed
/build/make/core/version_defaults.mk
8108edbc87098109d17dca85b1740ed34bd5936c 12-Apr-2018 Adam Seaton <aseaton@google.com> Update security string to 2018-05-05 on pi-dev
Bug: 74345861
/build/make/core/version_defaults.mk
191badd71b4c921c3ccd095fa0dfffc213b6df76 09-Apr-2018 Ian Pedowitz <ijpedowitz@google.com> Bump PLATFORM_PREVIEW_SDK_VERSION to 2 for P-Beta1

Change-Id: Ic4e94c90fb1f86283858a88777a92ae75d6b65ed
Fixes: 77801171
Test: N/A
/build/make/core/version_defaults.mk
972bd248f9f437e4b1ad8e243928ca4edea27ee9 22-Feb-2018 Nan Zhang <nanzhang@google.com> Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd am: 90b8d087e6
am: 7e634580ba

Change-Id: I514525914843c2cad6591ed6f515aed3aecc286a
7e634580bacb1a5efaa8b33160e0212c6269f95b 22-Feb-2018 Nan Zhang <nanzhang@google.com> Merge "Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make." am: d3bec931cd
am: 90b8d087e6

Change-Id: I7360282931fa4646e733f7326aea5a2a3cea1a97
0abdb5811d220f6e1a28d114a46cb76306a4a3ff 21-Feb-2018 Nan Zhang <nanzhang@google.com> Use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER in Make.

<Two phase commits> Since internal master code has more places that use
BUILD_NUMBER (mostly in vendor/) than AOSP (conflict). We can't
deprecate BUILD_NUMBER directly. Therefore, we try to switch to
BUILD_NUMBER_FROM_FILE as much as possible at first. Then we will do
a one-off deprecation for BUILD_NUMBER in internal master next step.

Test: m -j
Bug: b/70351683
Change-Id: I14ffee7381933c9fde14c4bde8c0c14e45fe98bf
/build/make/core/version_defaults.mk
b351b6ebdedcfd82d0af06eb1b59b19533e43e1d 16-Feb-2018 Colin Cross <ccross@android.com> Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5 am: 0d68c850f7
am: 4b03c695d6

Change-Id: Ife94343139c513f5e80c87d8dbcd88587f99f2e3
4b03c695d6c5379e0ddf7a38cd545b7b84b50f93 16-Feb-2018 Colin Cross <ccross@android.com> Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5
am: 0d68c850f7

Change-Id: I2792a15a40f3d51a3d6a5a446e45071dd0970e9a
ce8c05196d6104e10f1b004caea0969a3089e138 16-Feb-2018 Colin Cross <ccross@android.com> Partially revert BUILD_DATETIME change

Change Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901 caused kati to
regenerate on every build:
$(shell cat out/build_date.txt) was changed, regenerating...
Switch back to $(shell date +%s) which is special cased in kati
to not cause a regeneration. Everything besides DATE will still
use BUILD_DATETIME_FROM_FILE from soong_ui.

Once BUILD_NUMBER is moved to soong_ui $(DATE) is no longer
necessary and the whole thing can be removed.

Bug: 70351683
Bug: 73352417
Test: m && m doesn't regenerate
Test: m BUILD_DATETIME=1234 shows up in ro.build.version.incremental
Change-Id: I8444beb2b47a49095ef760083fc85f220821bffe
/build/make/core/version_defaults.mk
f1cbc5dbf1eb66c0083682acd6f2177c9f4ea9cc 15-Feb-2018 Nan Zhang <nanzhang@google.com> Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f am: 03bca8c4a8
am: 649f5b3c9a

Change-Id: Iaf6c6240dce29da37b2b4dd30abbc7326a5464be
649f5b3c9a2bc3912162b0e1d903b1cc958dc9e1 15-Feb-2018 Nan Zhang <nanzhang@google.com> Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f
am: 03bca8c4a8

Change-Id: I3f8e13a53dbd3217f3ae15b9512d3bb917695df1
975f41ed349c7105d7b685371723a3f6bac199bc 14-Feb-2018 Nan Zhang <nanzhang@google.com> Remove BUILD_DATETIME from Make.

Soong_UI will handle build timestamp and export date file to Make.

Test: m -j32
Bug: b/70351683
Change-Id: Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901
/build/make/core/version_defaults.mk
9f4cd386a01b04616ef69510830f99d30b4aebae 14-Feb-2018 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2 am: 1bdbab9542
am: 4a57b9de88

Change-Id: I16382ca753dbe46836a848b1e3224a255d5ad884
4a57b9de88941945951ab6b23ef511e60bcf4404 14-Feb-2018 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2
am: 1bdbab9542

Change-Id: If6a0846e43e34127265f2415a94f86cb2d5e53fb
1bdbab95422e7deaaf8c4bd16822b23f82290f2c 14-Feb-2018 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev
am: 402397c7f2

Change-Id: I56dac0e3f017fcdd57e522dccb36ab09cbb15ae2
a540c9466b1b29bc1202b663764a914e6ec48e31 14-Feb-2018 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9 am: 05e66a80dc
am: 7231e99020

Change-Id: I9ed65a0bfddfcdd30873dff9cb683fc08d31f6dc
7231e99020cb59651da7275221017ae0d7263e6d 14-Feb-2018 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9
am: 05e66a80dc

Change-Id: Ia769104e933025596c98b66598091eca3e3a860d
05e66a80dc21deafa5b3ed0df9e96c726d5205f2 14-Feb-2018 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev
am: 656fd837e9

Change-Id: Ic22c80e40cff1fe0afea3f26741d10c8a949b27b
312d7e7a3c020ed2aec01584ca80b6d6b76800de 12-Feb-2018 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev
Bug:73240847
/build/make/core/version_defaults.mk
accee92300b551449cca63b5b4de93543a77b854 12-Feb-2018 Adam Seaton <aseaton@google.com> [DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev
Bug:73240847
/build/make/core/version_defaults.mk
a9d30a23d37b97ffc73580905b1ded9edf03c26f 12-Feb-2018 Adam Seaton <aseaton@google.com> Update Security String in Master to 2018-04-05
Bug:73240847
/build/make/core/version_defaults.mk
eeb4dba38a2e0171b6349397b37f74cfc758eced 25-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> Update Security String to 2018-03-05 for master

Bug:72469949
/build/make/core/version_defaults.mk
08a11a771c7a4a2f8c04a382f2192da243023bd8 14-Dec-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Enforce deprecation policy for apps.

Android platform drops support for apps that target a
very old API level. Apps targeting version earlier than
Android Jelly Bean MR1 (2012) will show a warning dialog
when starting an activity.

Test: atest CtsActivityManagerDeviceTestCases:DeprecatedTargetSdkTest
Bug: 63926630
Change-Id: Ia849d67339d5172c09960725b6b1e200df0307d1
/build/make/core/version_defaults.mk
d8432e2384a5b00861569df7663009705b34018b 23-Jan-2018 Jiyong Park <jiyong@google.com> Merge "Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS" am: ae891fb19e am: 4de1dc97c0
am: 2c975edc0e

Change-Id: I41a3895bd273acf41481659782d0c9b410b24ea0
2c975edc0e76aca43227f12151f660d8f34246dd 23-Jan-2018 Jiyong Park <jiyong@google.com> Merge "Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS" am: ae891fb19e
am: 4de1dc97c0

Change-Id: Ie3104726801d314058c059691e2fef77da07e9e7
641b6cc6b01d0bf43cf7ec8d7088e42d84f12f40 15-Jan-2018 Jiyong Park <jiyong@google.com> Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS

PLATFORM_SYSTEMSDK_VERSIONS is the list of System SDK versions that the
platform is supporting. Contrary to the public SDK where platform
essentially supports all previous SDK versions, platform support only a
few recent System SDK versions, since some of old System APIs are
gradually deprecated, removed from the following SDKs and then finally
deleted from the platform. This will be part of the framework manifest.

The list can be specified by setting PLATFORM_SYSTEMSDK_MIN_VERSION. If
it is set to an old version number, then System SDKs from the version
to the current version (PLATFORM_SDK_VERSION) are considered to be
supported by the platform. If PLATFORM_SYSTEMSDK_MIN_VERSION is not set,
only the latest System SDK version is supported.

Next, BOARD_SYSTEMSDK_VERSIONS is the list of System SDK versions that
the device is using. This is put to the device compatibility matrix
device is using. The device and the platform is considered as compatible
only BOARD_SYSTEMSDK_VERSIONS in the device compatibility matrix are
in the PLATFORM_SYSTEMSDK_VERSIONS in the framework manifest.

When BOARD_SYSTEMSDK_VERSIONS is set, a Java app or library in vendor or
odm partitions which didn't specify LOCAL_SDK_VERSION is forced to use
System SDK. Also, the build system does the additional integrity check
to ensure that LOCAL_SDK_VERSION is within BOARD_SYSTEMSDK_VERSIONS or
PLATFORM_SYSTEMSDK_VERSIONS (if BOARD_SYSTEMSDK_VERSIONS isn't set).

Bug: 69088799
Test: m -j
Test: BOARD_SYSTEMSDK_VERSIONS=P m -j
Change-Id: If4d59f6030e4cc402e015701d0caf94aeec37263
/build/make/core/version_defaults.mk
e8aa8ed91fdbd0f2b6eaf4775a455b3429d8d69d 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241 am: 44861dc6dd am: d57400b494
am: eaba92c92c

Change-Id: I599dba59b95f4684df8ce15fbff375a1f5771dca
eaba92c92c2f341091f658609ff3f8c4b11a37d4 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241 am: 44861dc6dd
am: d57400b494

Change-Id: If650f336cf65ecc97eca7a2095dd77052dfd8fc2
d57400b4942a777b09dab40b532325f2ec4cabef 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241
am: 44861dc6dd

Change-Id: If466dfd2c187d532256400c542a2365255db8e3f
44861dc6dd36e1a54bdb67f072667452a1f80991 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev
Bug:71860241
/build/make/core/version_defaults.mk
650dcd0d5c32e7e22cdff89bfa52e286d76a331e 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6 am: 560b80b913
am: b02a234540

Change-Id: If18833bc3c3ca86530c713fbea32f1834566a9ac
b02a234540bce45e8c93fef68ce89a3a9ec7eb1b 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6
am: 560b80b913

Change-Id: I3e98e6c0e4c054460a9972cb2caf1149e0713282
560b80b9139b898c502d20b85e1337eb0f5e2fa5 12-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev
am: 48539e0ff6

Change-Id: I4ee78230426155da8d620bfed6df81b5073e9de5
275847767a1349fd6887ca67501474c593a21622 11-Jan-2018 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update security string to 2018-03-01 for oc-dev
Bug:71860241
/build/make/core/version_defaults.mk
fd67c909e1a1daa37bcf167c9d66e23962ea619e 21-Dec-2017 Justin Yun <justinyun@google.com> Merge "Use PLATFORM_VERSION_CODENAME for VNDK version" am: 5281020692 am: bbbd85a172
am: fa9d3b129a

Change-Id: I4a2a4130f4847c4d1735b11a229473652337948c
fa9d3b129afe4ea1e29de912aa0a3c41d94c8005 21-Dec-2017 Justin Yun <justinyun@google.com> Merge "Use PLATFORM_VERSION_CODENAME for VNDK version" am: 5281020692
am: bbbd85a172

Change-Id: Ic1708ba5468e3628314e9e33a11657ba9f7ee87b
729856a5f2d14bedf9d12e17e05ebe11019c2460 13-Dec-2017 Justin Yun <justinyun@google.com> Use PLATFORM_VERSION_CODENAME for VNDK version

Before Android version is released, we may use
PLATFORM_VERSION_CODENAME for PLATFORM_VNDK_VERSION to add version
suffix to VNDK directories.

Bug: 70584135
Test: Test youtube and RS apps
Change-Id: Ie788544740a5257232abc2c9acbce64749d15602
/build/make/core/version_defaults.mk
c153a4b7933cb7aea59420213854fd80b91f5f0f 14-Dec-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add am: 9e67329b15
am: e34617a4cc

Change-Id: I1faf5d1a8d1e2aeb35f6230f890cf74ef9651980
e34617a4cc48db3d1a077631d05a3aa524005480 14-Dec-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add
am: 9e67329b15

Change-Id: Ica0fc60b65b6bef7dd72de40c56e9fbdef2e2e64
9e67329b15eef125905d0bc1568ae02c64f77f4b 14-Dec-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883
am: fb5f3b5add

Change-Id: Ic0f372df927167d890bf29554bc737a6c4aa2b1b
fb5f3b5add30fa435008e165da930e1a81bcfd8f 13-Dec-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev
bug:70348883

Change-Id: I3e6a87e66cd2c113d2f8fc0e9572b0a2744a6515
/build/make/core/version_defaults.mk
577d9eddc04a886869db4c38b33d936941d1a339 14-Dec-2017 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266 am: 07de097829
am: f1a38a2ef0

Change-Id: I874d361286412b3ee25c20c3c45389fefc034b8d
f1a38a2ef00f9aea820f027aae96709db9dd2852 14-Dec-2017 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266
am: 07de097829

Change-Id: Ifd5ff222586f78404a58ad1d73e03d01fcf983dc
07de097829b5c421aac0ee9817e8a473f2ed1468 14-Dec-2017 Adam Seaton <aseaton@google.com> Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
am: 3c12119266

Change-Id: I24ffbb6560091677f6bf71ae0c7c705eb2b894f2
ee2346fa89ff530ae88451fbc404fa5a73258703 13-Dec-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update security string to 2018-02-01 for oc-dev
bug:70348883

Change-Id: Ib87775083eb064c485a44dffcf3b4630d33d39c5
/build/make/core/version_defaults.mk
6686e51b75f8e7808c0387bdfba0d22663732113 13-Dec-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Merge "Add PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"
1a029f0da23613534a8665525413713a28fa3d43 13-Dec-2017 Justin Yun <justinyun@google.com> Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44 am: db00ea991d
am: ea0752140f

Change-Id: Ib0ecca7c0b324e65e8a9312423eef4deb2a6b3f5
ea0752140fb5cc74d05d57d14122fc0b52adb827 13-Dec-2017 Justin Yun <justinyun@google.com> Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44
am: db00ea991d

Change-Id: I351f15cc9ab934a9da95b24acb8e80410c5e93d2
2a233b3b86e76c9bce28a322881c9f2d7fa48746 07-Dec-2017 Justin Yun <justinyun@google.com> Define PLATFORM_VNDK_VERSION

PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
/build/make/core/version_defaults.mk
ff188feeb1e126dd1f43e9c780eef84e1666d585 11-Dec-2017 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update security string to 2018-02-05
Bug 70487538
/build/make/core/version_defaults.mk
e554015b3a84ff080c61029963b9f94cf33d3af6 05-Dec-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Add PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

Exposed as ro.build.version.min_supported_target_sdk build_property

Test: make
Bug: 63926630
Change-Id: I8084fd4c54d9c2fb5e2683430e2b3aaf4c5f4a7a
/build/make/core/version_defaults.mk
d067fd3c74f8612e9c1cd69ec1b933c90405aa73 14-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226 am: b58800a22c am: ec071e07df
am: 43738d2a71

Change-Id: I63edb214802f3e1de48fe845cf528ba6ce39e1f1
43738d2a7189df1d073605559eb0d8b7cd7fafc2 14-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226 am: b58800a22c
am: ec071e07df

Change-Id: I8b625eee6ed5b782649d7a6d4b98b3e3acc4ac31
ec071e07df559c83e0783a18735f2ef179f18d4a 14-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226
am: b58800a22c

Change-Id: I15c6ee36fe858323759bcd91132b604adf0c3cc5
b58800a22c230eeac0d2a6fe5ded7a76a95a4a5f 13-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01
Bug: 69257226
/build/make/core/version_defaults.mk
0185c51295cd2ea46a62e1b3b3a9ea4136f78b26 13-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed am: ec439b54fb
am: ed2f52ccb5

Change-Id: Icb90f760be666a1115a0b3d7b1f85fb143752181
ed2f52ccb56d3d5093071ae4ffe93ffc68fa46c7 13-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed
am: ec439b54fb

Change-Id: I54c898d6a0d0dd5edc4ecbd6a069741079aaa3ea
ec439b54fb8c6380dcb772d8dd0316c159a775b6 13-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
am: 9a8d84b8ed

Change-Id: I01c2010599a495aec3943cda02ea22f85fdae29d
c53a14f1745cd302cb4951ed803679770ba584c4 13-Nov-2017 Elisa Pascual Trevino <elisapascual@google.com> [DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05
Bug: 69257226
/build/make/core/version_defaults.mk
bf57d78c244ad8c0ea670ac36f66c2adceb71b3e 04-Nov-2017 Adam Seaton <aseaton@google.com> Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d am: 4ec4999b54 am: b6cd7f71f9
am: 3a2b775a96

Change-Id: I35ed5c50c7c151db4aff1c48483f7e450822dce3
3a2b775a964982e8e1dfc2f9f476cf92633ec5fc 04-Nov-2017 Adam Seaton <aseaton@google.com> Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d am: 4ec4999b54
am: b6cd7f71f9

Change-Id: I59598976c3f62cb11bc80c51c66ebf88395a720e
b6cd7f71f91d5bd1d04b1034ca2c54b2dae8dce2 04-Nov-2017 Adam Seaton <aseaton@google.com> Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d
am: 4ec4999b54

Change-Id: I1fc9a861ca5fc9c641e44dfb14fa6e23bb656e93
4ec4999b54d0cb8bdb4b6d71bed76040e6b4d264 04-Nov-2017 Adam Seaton <aseaton@google.com> Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev
am: 8fdda7d80d

Change-Id: Ib1b6381be2565f9cb5d9e5e8a798de8240592774
81ee575d52e964d1a3933ac6e8e1a680321883a8 13-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-05 for December Security
Bug: 67774760
/build/make/core/version_defaults.mk
b80637a239659ad8829b75bcccc531861eddb7d9 15-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa am: 893343fa7b am: bb8028e3f3
am: ed0f11b63d

Change-Id: Ie5d569199f9c1ad22dcb07a2ba18b5202ffe266d
ed0f11b63d8134444744acdd5127fd6706880b94 15-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa am: 893343fa7b
am: bb8028e3f3

Change-Id: Iccb8100ab0c8d15d49bfd7e68c0bbae3df0b0e2a
b2d1ce3cc684301a6d71f4efbbc2a8b19cab0617 15-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa
am: 893343fa7b

Change-Id: I4b2dda257e1e027524976f6b8bd823dae5c5813e
bb8028e3f31f3baf4f0e28a7409281d35d8592ed 15-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa
am: 893343fa7b

Change-Id: I36ee53034b19c59b5d070c8c45f404b031fe9783
893343fa7ba0c51a19d32377a4393be14969d6a3 15-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-01 For December Security Bug: 67774760
am: 47ac5ac8aa

Change-Id: I89f4e9a4c5ec1c57cadb66605643a953f391969b
47ac5ac8aa19eb927125f384c7eb5b7a5430530f 13-Oct-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-12-01 For December Security
Bug: 67774760
/build/make/core/version_defaults.mk
b97c97b6433288bc169ce324c92f6461270a08cb 03-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add P back to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
e13a588aa6a1bcf2858a3206b1716cafee5e7cbc 03-Oct-2017 Colin Cross <ccross@android.com> Add P back to oc-mr1-dev-plus-aosp

Specialzing O MR1 shouldn't have removed P from oc-mr1-dev-plus-aosp.

Test: none
Change-Id: Ida774a3bc6fa7884e328eb70abb6b2cca7c32028
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
/build/make/core/version_defaults.mk
69ced5de5ec848f781956885c9bae52ea0106918 02-Oct-2017 Colin Cross <ccross@android.com> Delete jack support am: a6bc3a8a4c
am: 37bf2b1250

Change-Id: I19133aedbfe91f7cd49588b33f517dc4bb17b91c
37bf2b1250c5bb638cc1db853f499ae56cf8ee2e 02-Oct-2017 Colin Cross <ccross@android.com> Delete jack support
am: a6bc3a8a4c

Change-Id: Ie8353581a40916a1f267be9127f0fe2603119f34
a6bc3a8a4cfaa272499503890bc73b82ba61d6cb 27-Sep-2017 Colin Cross <ccross@android.com> Delete jack support

Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d732a04d07052217602790a3fec8208f8)
/build/make/core/version_defaults.mk
5db5d31d732a04d07052217602790a3fec8208f8 27-Sep-2017 Colin Cross <ccross@android.com> Delete jack support

Remove all support for running jack.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
/build/make/core/version_defaults.mk
3dcf1d7e34059b040b5c04d9a89b2cb5ae3ed01c 14-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6 am: db4b460d4b
am: c6f2363c5e

Change-Id: Idcaf338b642710ea039728cb3332b5981d759745
6f04be5950e3c47029df6aa74feb5198135648d2 14-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131 am: 8e3eac06fb am: 813eb5e81d
am: eb202ed342

Change-Id: I54436764caa07d240d6d36d0d72c32af18717be0
c6f2363c5e8b44ac6486e3e7defeeba6c0467fcd 14-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6
am: db4b460d4b

Change-Id: I60112d1f0980ad0707ddf757735d73e62b4d7817
eb202ed342785aa4ce6bd71c69969417c4b1cd6e 14-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131 am: 8e3eac06fb
am: 813eb5e81d

Change-Id: Ib1cb2b5d8789b8b43de101786ceb00d98e156afa
db4b460d4ba614f52bd28e3c8fa63bceccada836 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Ia0a597ebe1b74390761e51481cf90a20e6376b31
813eb5e81dc515c51631424b66669dc7040d3469 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: Icd9ef222b91081a89b386d124eeed39d0caa6df8
1bc297f5a4e4d462c8991ba67cc9f4da40e73f9e 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Icf400abc60bc19454782c54502f19268e67dd240
3d2a4f8363d9b38cea32c29aac61e60f2ed78936 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: I4fd03c02fc470cc1738effa2d1209503ca717ded
6b7c615cb629d882e151e0438a834157a7b71436 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
8e3eac06fb117f9812bf88fed9b6a7739364cf95 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
d24487a2f2f215e5de8aad8117e58f81eaf1529c 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-05 on oc-dev bug:65631379
/build/make/core/version_defaults.mk
8f4a4c213118ce088245abc4f31204393bab62a5 13-Sep-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-11-01 on oc-dev bug:65631379
/build/make/core/version_defaults.mk
21873fbd4f44b31b38526567ccba6e52ab2be3d8 07-Sep-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b
62a835d0ef89e51f4a97fecf8576224551b545a5 24-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> DO NOT MERGE OC-MR1 is REL

Bug: 64982450
Test: manual
Change-Id: I054e3ecff49803e61e7741753fe6764a567d72c4
/build/make/core/version_defaults.mk
d4171ee424ebcc2312adaf27eba58c972272daf0 24-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> Removing OMR1 as oc-mr1-dev is finalized

Bug: 64982450
Test: manual
Change-Id: Icff2687e4ca3a65f613b129967424b4d5e2b4059
/build/make/core/version_defaults.mk
f78770ddec5f4e79dda4472fa764a0a908b2e414 26-Aug-2017 Michael Wright <michaelwr@google.com> Merge "O MR1 is API 27" into oc-mr1-dev am: 0ba9648a13
am: f6b3316bbe

Change-Id: I30e5c55fc3d385a99c5d2678b8501ffedebe991f
f6b3316bbe5850fbc6132944b690941250f2a574 26-Aug-2017 Michael Wright <michaelwr@google.com> Merge "O MR1 is API 27" into oc-mr1-dev
am: 0ba9648a13

Change-Id: I092105b03769e3b5f7560d12f19ae3b88de95a7c
5d8410b60ae2ecab331ba08fabec6621fa5711a9 23-Aug-2017 Michael Wright <michaelwr@google.com> O MR1 is API 27

Bug: 64982450
Test: manual
Change-Id: I0d59724f1bcb8091488f23cd5d98d2688009b605
/build/make/core/version_defaults.mk
e2ef13cf93cb6188b059d273d14723a01ff8b51e 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: ca22b203d0 am: 1b17813951
am: d8115fb4f9

Change-Id: I337e229de9d9a0e701c147cbe2e4d729d70e1fad
9165ff9a52d2fcba772413684483724b760c44a8 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 55b78726b4 am: 2174b6e355
am: 50bd0fa2cc

Change-Id: I9535f7a30c17e939425176257fc3fba43537f383
d8115fb4f9e8cabe68dc38ec690adeae5d1c3cf1 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: ca22b203d0
am: 1b17813951

Change-Id: I9f2545f1f1c54edbaee396dc662111fa9b228769
bf413aa70d0d78756683edf480c8d9df050d3df3 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb

Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
50bd0fa2ccab49ebde6d789181af4abf4731b065 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 55b78726b4
am: 2174b6e355

Change-Id: If6ccc8963facaa0794f51b67718b7c2770e506e0
90b1c82d83182b751811779a90c1ed4e935f2bd7 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201

Change-Id: I2acc807fc3b4fdaea5592ea0b885cb206284a211
1b17813951e12fb4a7df5e5cc0d851db5043146a 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: ca22b203d0

Change-Id: I65b91c3e3acfa25af3792ddb86d9da418daaae8b
2174b6e355d9e96b3dcca238f8229bb293621d8d 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 55b78726b4

Change-Id: I2454bd68b62032987f67cf00aa02f246fa097325
f3ae135ddbc08e8ffdae7214903345c599d6c06e 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
ca22b203d008fc537dbc2f95b5254d677d8dc4ff 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: I6b3fcb447c334206889a635178cda68f6bb20131
834db8c2010dcc193102220a70297e17a602bf1f 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
55b78726b454ae550e4e007fe917db6bf441d96a 23-Aug-2017 Adam Seaton <aseaton@google.com> Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I56396b94ed83855dc0c0f86c99fffa46120b92eb
4e140ce86ac37b5a5aec06058262fe1a7a835909 21-Aug-2017 Adam Seaton <aseaton@google.com> Update platform security string to 2017-10-05 in oc-dev Bug:64896113
/build/make/core/version_defaults.mk
80d3742026e1640e3cbcfb2bcbc9244733dc05d4 21-Aug-2017 Adam Seaton <aseaton@google.com> Update platform security string to 2017-10-01 in oc-dev Bug:64896113
/build/make/core/version_defaults.mk
faa0c8a45b3af41b12d3680c4cf901a19fa7c65e 16-Aug-2017 Amit Pawar <amitpawar@google.com> Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev
am: f01a5ef7c3

Change-Id: I6cb15b97e680448d1d459d9a4dd67b7b520a31a9
47f1b93dfa00b1c0a56956982daa6c7e9b0abca3 09-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> v8.0.0 was only temporary. O-DR is 8.0.0

Fixes: 64130669
Fixes: 64125438
Fixes: 64437834
Test: Flashed oc-dr1-dev ToT and ensured device booted
Test: Rebuilt with topic:ODR-8.0.0 and reflashed without wipe
Test: device booted
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: I1316358d0121b82902ac708088a49d480f3a6ad4
/build/make/core/version_defaults.mk
98c2735b828cdbdce7af54fa066d55b405be0296 04-Aug-2017 Amit Pawar <amitpawar@google.com> oc-mr1-dev is now 8.1.0

Bug: 62103626
Test: In progress
Change-Id: I53d2248669892e200d1e5d966027f35f38a8a1f8
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
/build/make/core/version_defaults.mk
7135aa83a51e8e2005f844382767e408d0397799 04-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "Making a comment a bit more explicit" into oc-mr1-dev am: 9a50c8507a
am: 17a100af91

Change-Id: I3402c2225d41a67a052ac5866a751e81ff5abee2
17a100af915fd267576870ee11b58b06406cff14 04-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "Making a comment a bit more explicit" into oc-mr1-dev
am: 9a50c8507a

Change-Id: I459e3f9410d2fed7788dda4206ef2b7447c5b3cd
f28bf722c2ffe78fbc888c5d13bbd48d6128ce8e 04-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> Making a comment a bit more explicit

Bug: 64364822
Test: N/A comment only
Change-Id: I4ef65aef4521326ac48539ad27422f881cc3e883
/build/make/core/version_defaults.mk
a302746d9b5c825e15a840e72311569195697838 28-Jul-2017 Bart Sears <bsears@google.com> Change Android version to v8.0.0

Change PLATFORM_VERSION.OPD1 to v8.0.0. This is a temporary
change until we get a new KeyMaster that can handle going from
8.0.1 -> 8.0.0. At that point we will change PLATFORM_VERSION
to 8.0.0.

Test: Check: Settings > System > About phone > Android version.
Also verified that update from 8.0.1 to v8.0.0 works (i.e. device
boots and shows new Android Version).
Bug: 64130669
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: Ibb8fbb123a74196f57f649d0c22f58beefaf6d06
/build/make/core/version_defaults.mk
91a169e68f419391025d66322edaa95c984ea89d 03-Aug-2017 Dan Albert <danalbert@google.com> Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53 am: 373d682c69 am: 3626b53135
am: 86b295be2e

Change-Id: I382b226583221f9ee8bd396e707f29a585d133ea
86b295be2e75c04902a47aea8986beddffe70a1d 03-Aug-2017 Dan Albert <danalbert@google.com> Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53 am: 373d682c69
am: 3626b53135

Change-Id: I0cb5a3afeec15c62228dc767beb93e60b0478056
3626b5313503b6c6b855090306752b1ee15453e5 03-Aug-2017 Dan Albert <danalbert@google.com> Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f am: 5ebfa32c53
am: 373d682c69

Change-Id: I28413287340f0206ecea05896da74cce815e7d1f
373d682c69a2cccfb75a0ccdeb6bc37292110844 03-Aug-2017 Dan Albert <danalbert@google.com> Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES." am: 577ff4730f
am: 5ebfa32c53

Change-Id: Ic4abaf6dc95b037858beb969b41b3b52bd057afb
5ebfa32c5334c06769a14a72d166d4bd96dd58c2 03-Aug-2017 Dan Albert <danalbert@google.com> Merge "Add PLATFORM_VERSION_FUTURE_CODENAMES."
am: 577ff4730f

Change-Id: Ib42278524d19d1a464b9357b78c5fd05e6736e04
cd38b8601665e4474ec4536229d3c9b7eba2261f 28-Jul-2017 Dan Albert <danalbert@google.com> Add PLATFORM_VERSION_FUTURE_CODENAMES.

PLATFORM_VERSION_ALL_CODENAMES isn't actually all the code names, just
the ones active in our current target. We need the list of all targets
so we can validate code names in NDK stub templates even if they're in
the future. Unfortunately, all_codenames has been baked into
build.prop for ages, so we're stuck with this name. Improve the
comments and add PLATFORM_VERSION_FUTURE_CODENAMES to cover to cover
the future targets.

Test: make checkbuild
Test: check $ANDROID_PRODUCT_OUT/system/build.prop
Bug: None
Change-Id: I81fed6f761e5362ef3050be9d1e3fb17739feadd
/build/make/core/version_defaults.mk
9c5e7e24b8292f4b46cdc5e4e6c8d69c9df82c01 01-Aug-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "oc-mr1-dev is OC-MR1, don't allow building beyond it" into oc-mr1-dev
am: 0914778538

Change-Id: Ib547b6f639967a83b85ccf7d617b655193dc4b4d
22c06e7c8ed557a884b6d3998c9e7cec1a57d20b 28-Jul-2017 Ian Pedowitz <ijpedowitz@google.com> oc-mr1-dev is OC-MR1, don't allow building beyond it

Bug: 63544673
Test: Can't lunch marlin-userdebug-PPR1
$ lunch marlin-userdebug-PPR1
build/core/version_defaults.mk:55: Invalid TARGET_PLATFORM_VERSION 'PPR1', must be one of
build/core/version_defaults.mk:56: *** OPM1. Stop.

Change-Id: I116b0cebb353600277876eabccf41e7dda736151
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
/build/make/core/version_defaults.mk
b56fcf400f72ddd096df98993b015acef3487e2e 28-Jul-2017 Ian Pedowitz <ijpedowitz@google.com> master is now P

Fixes: 64141010
Test: source build/envsetup.sh && lunch marlin-userdebug
============================================
PLATFORM_VERSION_CODENAME=P
PLATFORM_VERSION=P
TARGET_PRODUCT=marlin
TARGET_BUILD_VARIANT=userdebug
TARGET_BUILD_TYPE=release
TARGET_PLATFORM_VERSION=PPR1
TARGET_BUILD_APPS=
TARGET_ARCH=arm64
TARGET_ARCH_VARIANT=armv8-a
TARGET_CPU_VARIANT=kryo
TARGET_2ND_ARCH=arm
TARGET_2ND_ARCH_VARIANT=armv7-a-neon
TARGET_2ND_CPU_VARIANT=kryo
HOST_ARCH=x86_64
HOST_2ND_ARCH=x86
HOST_OS=linux
HOST_OS_EXTRA=Linux-4.4.0-79-generic-x86_64-Ubuntu-14.04.5-LTS
HOST_CROSS_OS=windows
HOST_CROSS_ARCH=x86
HOST_CROSS_2ND_ARCH=x86_64
HOST_BUILD_TYPE=release
BUILD_ID=MASTER
OUT_DIR=out
AUX_OS_VARIANT_LIST=
============================================

Change-Id: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
/build/make/core/version_defaults.mk
e725fdbe3b91724f836148c9ffa5a4b35d0844b4 26-Jul-2017 Dan Willemsen <dwillemsen@google.com> Merge changes I863200b2,Ifdd9663b am: 770a498e99 am: 10e9d25035 am: 1761a50f5f
am: eba39713c8

Change-Id: Ib56193cfc8750b1d2ff1c509ef7440e2234f48ce
eba39713c84bd08e8641490beb9fa80d92524490 26-Jul-2017 Dan Willemsen <dwillemsen@google.com> Merge changes I863200b2,Ifdd9663b am: 770a498e99 am: 10e9d25035
am: 1761a50f5f

Change-Id: Ia50645f20aaa01796536f784baf06605604008cd
1761a50f5f4d8e9fc85513b1b28c9b000131aa8c 26-Jul-2017 Dan Willemsen <dwillemsen@google.com> Merge changes I863200b2,Ifdd9663b am: 770a498e99
am: 10e9d25035

Change-Id: Icbf8da37e0e518b619fced846e70ef3eba8bfea9
10e9d250357c253b7b4881f3b49ff00383ea3ff5 26-Jul-2017 Dan Willemsen <dwillemsen@google.com> Merge changes I863200b2,Ifdd9663b
am: 770a498e99

Change-Id: Id9e3dd9d5e8ac3d85d5203dd6430243d9daf01bf
ce7f8dd15ad582899b3f694aeb0bb2097de9b94c 25-Jul-2017 Dan Willemsen <dwillemsen@google.com> Run `uname -sm` once, don't use python for HOST_OS_EXTRA

This saves 20-50ms for `lunch` (~7-10%), and double that for every build
execution.

Test: Check HOST_OS_EXTRA on Linux & Mac
Change-Id: I863200b2287c8867f40606237895b1d3ad91e1b3
/build/make/core/version_defaults.mk
edbd636d88e91c772b487cd81b243721bd887726 20-Jul-2017 Adam Seaton <aseaton@google.com> Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812 am: de8af68e73
am: 41020cce0f

Change-Id: I0a5b0cfe2334bff0750177bdffa3d58c07d38065
a8772230d1456f7431ed5bbdc1a67a95d05ddbb5 20-Jul-2017 Adam Seaton <aseaton@google.com> Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
am: c7d9294cd9

Change-Id: Iea69629779d87a7a6ae74216076f1093f13931b0
41020cce0ff3c0b6e3b8b29f1c56c06ebec55262 20-Jul-2017 Adam Seaton <aseaton@google.com> Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
am: de8af68e73

Change-Id: I66f8a11ddf19aca734841498fa71fab40699eb70
de8af68e73c3763eab201d957d571fcef79c9a95 20-Jul-2017 Adam Seaton <aseaton@google.com> Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812

Change-Id: Icfaf43620d6adb89d263711d3026c7c91ad08a1c
c7d9294cd90d27638af719c8079642ff2dc12272 20-Jul-2017 Adam Seaton <aseaton@google.com> Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812

Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
32f388f655be42e2c7b724ec8568164877a5507b 19-Jul-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-09-05 Bug:63846344
/build/make/core/version_defaults.mk
f1c17f17ff96d2a9705d6b7a003374c9f83ba14d 19-Jul-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-09-01 Bug:63846344
/build/make/core/version_defaults.mk
0596384adbabcca9fb0779b96832239bd0d08331 17-Jun-2017 Dan Willemsen <dwillemsen@google.com> Mark oc-dev-plus-aosp OPR1 as REL

It contains all of oc-dev, which has OPR1 marked as REL, so we should be
using API 26 instead of 'O'.

Test: Check PLATFORM_VERSION_CODENAME / PLATFORM_SDK_VERSION
Change-Id: I0e8f3b42b8ac60422f0a8b044de45ba03b0bcfcf
Merged-In: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
/build/make/core/version_defaults.mk
74d69626a9359cf7d6d8c1b7d973badad80cbb2e 07-Jun-2017 Colin Cross <ccross@android.com> Master is now OPM1

Remove OPD1 from master. Also remove the temporary workaround
for b/37208937.

Bug: 37208937
Bug: 38436796
Bug: 62596317
Test: builds
Change-Id: Id4ea864e1d78bb793b2d4a0705673a66a957acdb
/build/make/core/version_defaults.mk
42ff695568fc988e6b9683665a70113dd7d0a611 09-Jun-2017 Adam Seaton <aseaton@google.com> Updating security string to 2017-08-05 am: d6e984f9e3
am: d2d14aa0ea

Change-Id: I116998ae8f48619f32bd443527fb0f228160326d
d2d14aa0ea8a32caa5634c9854249cea62c90e21 09-Jun-2017 Adam Seaton <aseaton@google.com> Updating security string to 2017-08-05
am: d6e984f9e3

Change-Id: I99f6d08450167c1b3d91e89818f07f2c0e0e2a24
c5c1af423adaf80c096c835140c2cc4dd7d23722 09-Jun-2017 Adam Seaton <aseaton@google.com> Updating security string to 2017-08-05
am: d6e984f9e3

Change-Id: I0b15f09daedf3c57f479da7ccf126a6ca56c9b56
d6e984f9e3bea44ec2519ecb502a4e93fd1ef1ac 09-Jun-2017 Adam Seaton <aseaton@google.com> Updating security string to 2017-08-05
/build/make/core/version_defaults.mk
b22b57218b006616e77d70094fac70844f46ae5d 07-Jun-2017 Colin Cross <ccross@android.com> Unspecialize oc-dev-plus-aosp

oc-dev-plus-aosp will become aosp master, which needs to continue to
be able to build features targeted at PPR1.

This reverts commit 096aaeee162a4bba904937705b0eb59ef5c2493b.

Bug: 36891159
Test: builds
Change-Id: I7060a5742609e96102027eea528e0e2db8e7b129
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
/build/make/core/version_defaults.mk
910e08c023a8c90c93874de380832fb4947ac3a7 07-Jun-2017 Baligh Uddin <baligh@google.com> DO NOT MERGE ANYWHERE - Set MAX_PLATFORM_VERSION to OPD1 on oc-dr1-dev

Bug: 38436796
/build/make/core/version_defaults.mk
71b832169f9cbe6663854eb026b620aa1328c234 06-Jun-2017 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "OC-DR is 8.0.1""

This reverts commit 780cd459dc6e12647e448607cd436e3a87031adc.

Bug: 62187941
Bug: 38502482
Change-Id: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
/build/make/core/version_defaults.mk
780cd459dc6e12647e448607cd436e3a87031adc 31-May-2017 Thierry Strudel <tstrudel@google.com> Revert "OC-DR is 8.0.1"

This reverts commit 43b282978081b492d5ddf9350c84f1538b731aa6.

Reverting until we get a fix that manage build number bump

Bug: 62187941
Bug: 38502482
Change-Id: Id1093857f9bf230e6e9757eeb84838d5b69fbda3
/build/make/core/version_defaults.mk
43b282978081b492d5ddf9350c84f1538b731aa6 22-May-2017 Ian Pedowitz <ijpedowitz@google.com> OC-DR is 8.0.1

Bug: 38502482
Test: source build/envsetup.sh && lunch marlin-userdebug && m -j40
Change-Id: Ic358ea8b6c23b83cfdd652b88ed5746a578c9edd
/build/make/core/version_defaults.mk
bf1d094db840cc41aa7619e2f47b3fe66579dda6 22-May-2017 Ian Pedowitz <ijpedowitz@google.com> Since OC-DR is also API26, it should be REL

Since OC is API26/REL now.

Bug: 38502482
Test: source build/envsetup.sh && lunch marlin-userdebug && m -j40
Change-Id: I4b44160cc4845975d8e6b0c2cfcb2dec69434716
/build/make/core/version_defaults.mk
4b2b2a7bdc776b360481ca63ff016e6b14fa456c 16-May-2017 Ian Pedowitz <ijpedowitz@google.com> Removing OPR1 from master as OC is API26

Bug: 38131332
Test: Compiles
Change-Id: I138bd0eae376b147192584a94d4f4ea67b1e99cb
/build/make/core/version_defaults.mk
8a180a854050758bb17a7111f61eb6bbaef08b52 16-May-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Revert "O is API 26.""" into oc-dev am: e46cc54ab1
am: e44086e272

Change-Id: I04ce2a9995ef882f443798cda89450dbba7fa38f
611c95a3f8d5bb9053fe6309ce1a1c99b346a12f 16-May-2017 Ian Pedowitz <ijpedowitz@google.com> resolve merge conflicts of be9844a03c to oc-dev-plus-aosp

Change-Id: If7d78718d8f6349b9b386c30096bd83d8f94cbc9
e44086e27223f71dfd254302d1f7b5dfb0bb007c 16-May-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Revert "O is API 26.""" into oc-dev
am: e46cc54ab1

Change-Id: Ie5bcfa449bfbad2ef0800f86a989db92d2c19087
ae1f3abef4cfe179fcf00b2a69a5c8ba93d48b6d 09-May-2017 Ian Pedowitz <ijpedowitz@google.com> O is 8.0.0 and REL

Bug: 38131332
Test: compiles
Change-Id: I0ccda8ab4f6edf056fd37bd8ee50555d01d3529e
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
/build/make/core/version_defaults.mk
9c350d7ef7a53cd1c1f3c66d6e0b619d381d5843 04-May-2017 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "O is API 26.""

This reverts commit 75feb8927ae20fc9ab3d0a256c1784aadacd3020.

Bug: 37480230
Bug: 37355569
Change-Id: I348413878e97f766863086d74bdc454f61b100ec
/build/make/core/version_defaults.mk
f94c2ef58b329103e3668c491eebcbdbc6212637 04-May-2017 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "O is API 26."" into oc-dev
am: 6f93dd52b2

Change-Id: I0a1678c8f4060df7fe07c57f062bc446cdeebdcf
75feb8927ae20fc9ab3d0a256c1784aadacd3020 04-May-2017 Ian Pedowitz <ijpedowitz@google.com> Revert "O is API 26."

This reverts commit 06fc7e023b1db7f020171a1748d9743af5d21e6c.

Reason for revert: b/37355569

Bug: 37480230
Bug: 37355569
Change-Id: I2eef4fb5369fa4e9d7a410461de63d4dd43dfc09
/build/make/core/version_defaults.mk
49718f9b8591ebbb97976235250c82f5046939fa 03-May-2017 Colin Cross <ccross@android.com> Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f am: 624932e360
am: 6969203720

Change-Id: I84652622424ec1abe317b847d5fe00962aeb5853
6969203720fa81c92703d714b8188a0b4092ece0 03-May-2017 Colin Cross <ccross@android.com> Merge "Only set TARGET_PLATFORM version in lunch when explicitly requested" am: 4a3dc1458f
am: 624932e360

Change-Id: I45f7279ee6a216fec15fcd2dd2337126d78bb684
1c1e142199faea72d5e5a20bc61cc6952d9220f4 01-May-2017 Colin Cross <ccross@android.com> Only set TARGET_PLATFORM version in lunch when explicitly requested

Setting TARGET_PLATFORM_VERSION to DEFAULT_PLATFORM_VERSION during
"lunch sailfish-userdebug" causes unnecessary pain when
DEFAULT_PLATFORM_VERSION becomes invalid after branching. Only
set TARGET_PLATFORM_VERSION if it was explicitly requested with
lunch sailfish-userdebug-OPR1.

Test: build/make/tests/envsetup_tests.sh
Bug: 34972208
Bug: 37208937
Change-Id: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
Merged-In: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
/build/make/core/version_defaults.mk
81cd9227f3bb73539fdb5773995517eaa0021176 03-May-2017 Michael Wright <michaelwr@google.com> O is API 26.
am: 06fc7e023b

Change-Id: I941174825498f5e0f517b6aa3634231a5af4c8ec
06fc7e023b1db7f020171a1748d9743af5d21e6c 02-May-2017 Michael Wright <michaelwr@google.com> O is API 26.

Bug: 37480230
Test: Build, run.
Change-Id: I2f0e7fecf38d224c20d18cff856c45a7a3e624ad
/build/make/core/version_defaults.mk
0a06d8ba7945354d57d12be03941623e5326e440 19-Apr-2017 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "master is now OPD1/ODR by default and adding OPM1/OMR1""

This reverts commit d9c3fd1d559072fa83d21f4aa258741ce69b818c.

Bug: 37201939
Fixes: 37212091
Change-Id: I7894321971c0b696594deb064ebed3f43cf7c8d1
/build/make/core/version_defaults.mk
b105e365c7afa8c32136eae32439aa64874bf2f7 01-May-2017 Colin Cross <ccross@android.com> Only set TARGET_PLATFORM version in lunch when explicitly requested

Setting TARGET_PLATFORM_VERSION to DEFAULT_PLATFORM_VERSION during
"lunch sailfish-userdebug" causes unnecessary pain when
DEFAULT_PLATFORM_VERSION becomes invalid after branching. Only
set TARGET_PLATFORM_VERSION if it was explicitly requested with
lunch sailfish-userdebug-OPR1.

Test: build/make/tests/envsetup_tests.sh
Bug: 34972208
Bug: 37208937
Change-Id: I40ba4617e73803c5bec1a8d317382f70fb3ec3a2
/build/make/core/version_defaults.mk
055547cddf7ebe17e7b32d0b957c9bb73ec135e7 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 am: 0e503efe43
am: 019c695262

Change-Id: I37a3b1cb0c40b7190bcdc3f88e2fe513346c8baa
91785ec139f3aaf0fcf8061ab92b38bdbf5bea09 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 am: 888cf4cf67
am: 17a45d4c94

Change-Id: Iccb34b97bfc970f6188860cd53bb4005029dc758
019c69526222262f53e7068b9ce1aa498f2ae5c5 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0
am: 0e503efe43

Change-Id: Ib1b56bf6343908c99bec636b7c0662eede3a9284
17a45d4c9491417caeaddb1c34f04c96c5825757 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986
am: 888cf4cf67

Change-Id: Ia4ff300b605e9ce6e93d8983e4d728d42516fa5b
49ca7ee1b02a7b56a4b31ec4e52d2d0f278daeea 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f
am: 15420e5bb0

Change-Id: Ia48ded0030f51f9f5381e1b84cb1d5a28d7bae42
c347cb49867a15f6a2800d2483ec578695274889 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599
am: 518f3b9283

Change-Id: Idcf446c209e4ef340d48942d63c5cabcc5d5bec6
15420e5bb00c1fc21067196170d02cf6ff4fa716 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
am: 70d708e29f

Change-Id: Iee4027fe4abe311f44582b430786ff3011d93476
518f3b92830ae393ecb53111185ac7c660981f28 13-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
am: d9a5e99599

Change-Id: I732c1fdf51b33a7588bdec0f5d86bb6a6210b334
70d708e29ff733778771deae004ec06dca419efb 11-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev

bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16
/build/make/core/version_defaults.mk
d9a5e995999d15175efba49e01a0844fe9d5cf84 11-Apr-2017 Adam Seaton <aseaton@google.com> [DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev

bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9
/build/make/core/version_defaults.mk
d9c3fd1d559072fa83d21f4aa258741ce69b818c 10-Apr-2017 Naveen Kalla <mrnaveen@google.com> Revert "master is now OPD1/ODR by default and adding OPM1/OMR1"

This reverts commit 9af3fa123c6e3347acea4657cb4969b421618c3a.

Bug: 37201939
Test: Build, load and ensure that hidden menu can be launched
Change-Id: I1641cb528883f912a8051c7660e2750985bafae8
/build/make/core/version_defaults.mk
0b1de05d3c63cbe99d07f48b2a255970a28629c2 08-Apr-2017 Colin Cross <ccross@android.com> Merge "Specialize oc-dev into OPR1" into oc-dev
am: b70a93465a

Change-Id: I488e308e863e7ea8ddbfe6f4d1a0588ebec016d5
096aaeee162a4bba904937705b0eb59ef5c2493b 04-Apr-2017 Colin Cross <ccross@android.com> Specialize oc-dev into OPR1

Only allow building OPR1 in oc-dev.

Bug: 36891159
Change-Id: Ib778ad5232a8e33e312d467f6f6970a8027c81c1
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
Test: treehugger
/build/make/core/version_defaults.mk
9af3fa123c6e3347acea4657cb4969b421618c3a 30-Mar-2017 Ian Pedowitz <ijpedowitz@google.com> master is now OPD1/ODR by default and adding OPM1/OMR1

Test: source build/envsetup.sh && lunch sailfish-userdebug && m -j40
Test: source build/envsetup.sh && lunch sailfish-userdebug-OPM1 && m -j40
Change-Id: I546d1c25a2b1d948a0e7da796f59e734a98635da
/build/make/core/version_defaults.mk
f658305484c9836490e01a5090452162b4324318 28-Mar-2017 Colin Cross <ccross@android.com> Add min and max supported versions

Add MIN_PLATFORM_VERSION and MAX_PLATFORM_VERSION to track
the range of releases that are expected to be released from
the current branch.

Also simplify version_defaults.mk by moving most of the code
to envsetup.mk.

Test: build/make/tests/envsetup_tests.sh
Change-Id: I4f19c31c267e202f8f5ba1384a8b4385d725f9d7
(cherry picked from commit c901659377361841fe12658e4a33e1780719f881)
/build/make/core/version_defaults.mk
9a9e7dd8a2ef8fb2c0424a90e0ab7fb491a586cd 01-Apr-2017 Dan Albert <danalbert@google.com> Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a am: e2b92d809f
am: 6861a292a0

Change-Id: I1d91765933fa76d8a83ab6932563c637f0c34163
6861a292a0f6a885a569edfe41ab189527e3acb1 01-Apr-2017 Dan Albert <danalbert@google.com> Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a
am: e2b92d809f

Change-Id: I9cb0b52b1121146aa75ffff31e63ae5118ad9510
e2b92d809fa7b0a85d4aeeb48961b83c83d853c8 01-Apr-2017 Dan Albert <danalbert@google.com> Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES."
am: 979dac690a

Change-Id: Ib4aa98fe335d90f1407ccb27fa4c57d5d30cbbf5
839db81b26e8b912250c3ee081bc354e7b660412 28-Mar-2017 Dan Albert <danalbert@google.com> Auto-generate PLATFORM_VERSION_ALL_CODENAMES.

Test: Temporarily added additional codenames for OPD1 -> O and
OPM1 -> O-MR1. Lunched aosp_sailfish-eng, built build.prop and
checked that ro.build.version.all_codenames was "O". Then
lunched aosp_sailfish-eng-PPR1 and checked that it was
"O,O-MR1,P".
Bug: None

Change-Id: I51189f5b40e3e7f99e2fc08bb5616c51a23e3b19
/build/make/core/version_defaults.mk
99a995157bacaff27f1e6de7d01d041337ac10b2 29-Mar-2017 Colin Cross <ccross@android.com> Merge "Add min and max supported versions" am: ae4779e254 am: e611741d85
am: 4859177dd9

Change-Id: I8d5501607db18382dec51a7cfa490536a0218406
4859177dd9fa5d56acae97d10b67e90bfc1e452e 29-Mar-2017 Colin Cross <ccross@android.com> Merge "Add min and max supported versions" am: ae4779e254
am: e611741d85

Change-Id: I392213b405efb58d8aa3fb3b2151280d4426d380
e611741d852e30b0accb1aed56aa441817a062e0 29-Mar-2017 Colin Cross <ccross@android.com> Merge "Add min and max supported versions"
am: ae4779e254

Change-Id: Ic6d0fb99e95d55253be00f7b191d3287a207c2c8
c901659377361841fe12658e4a33e1780719f881 28-Mar-2017 Colin Cross <ccross@android.com> Add min and max supported versions

Add MIN_PLATFORM_VERSION and MAX_PLATFORM_VERSION to track
the range of releases that are expected to be released from
the current branch.

Also simplify version_defaults.mk by moving most of the code
to envsetup.mk.

Test: build/make/tests/envsetup_tests.sh
Change-Id: I4f19c31c267e202f8f5ba1384a8b4385d725f9d7
/build/make/core/version_defaults.mk
1b81278572f132fc5449b52bc828089ab7434544 24-Mar-2017 Colin Cross <ccross@android.com> Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381 am: 7b5dc8ad3e
am: 086d109f35

Change-Id: If005f3917b1f1664b111ce7d070590a47a259ce5
086d109f350c245645693153357cdef2ca5fe06d 24-Mar-2017 Colin Cross <ccross@android.com> Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381
am: 7b5dc8ad3e

Change-Id: If12b3c0f688a8d4a42f188b98a1f18b86da57d13
7b5dc8ad3e5acca4f49a79cc73ac81a0c1f46cc5 24-Mar-2017 Colin Cross <ccross@android.com> Merge "Add TARGET_PLATFORM_VERSION to lunch"
am: a007142381

Change-Id: Ic9b38a74041f839300f82a4ecfb724079b62a900
8873713f36c4b0a737947b31ea8e28300e6df759 22-Mar-2017 Colin Cross <ccross@android.com> Add TARGET_PLATFORM_VERSION to lunch

lunch can now take combos in the form:
$TARGET_PRODUCT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT-$TARGET_PLATFORM_VERSION

If all 3 are not specified the unspecified ones will take the
default values provided by the build system (eng, and currently
OPR1).

In addition, error handling for invalid products, variants and
versions is moved to the build system.

Bug: 34972208
Test: build/make/tests/envsetup_tests.sh
Change-Id: Ib0aaa98633448ba9bd8df911704c9cb3a8ebbe85
/build/make/core/version_defaults.mk
662f11905dce54425b37c9c549f3280c65c387b8 22-Mar-2017 Ian Pedowitz <ijpedowitz@google.com> PLATFORM_PREVIEW_SDK_VERSION should be 2 for the next Preview/Beta Release of OC

Test: lunch marlin-userdebug && m -j40
Change-Id: I1654ab2b63ebddc79fd41f3c9d3d9e3902f03172
Fixes: 36512249
/build/make/core/version_defaults.mk
f35c03a6a526604e0d6555dc0c9ec90aef13e31c 22-Mar-2017 Colin Cross <ccross@android.com> Set PLATFORM_VERSION for PPR1 builds to P

Fixes error about missing PPR1.adb_key file.

Bug: 34972208
Test: lunch sailfish-userdebug-PPR1 && m -j
Change-Id: I82cd78376f3e238a6c4aaf27825c8d66b89d5a89
/build/make/core/version_defaults.mk
7ad4cdd91f08fe16b314a04835dc040158a21909 22-Mar-2017 Colin Cross <ccross@android.com> Use new naming scheme for TARGET_PLATFORM_VERSION
am: f6cf099b27

Change-Id: I8a43ab65525c72978dcfe8aee25f1022776af6a4
f6cf099b27d3e8bbbcfb8f6f924e995247b13f2c 21-Mar-2017 Colin Cross <ccross@android.com> Use new naming scheme for TARGET_PLATFORM_VERSION

Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
(cherry picked from commit d8bc190a637353652f5e16abc4f4c972b8dcf60f)
/build/make/core/version_defaults.mk
9efe51f27a66aa0597096bff298611d9b0da0331 21-Mar-2017 Colin Cross <ccross@android.com> Use new naming scheme for TARGET_PLATFORM_VERSION

Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
Merged-In: Ib00b13abe79a744e344b88bb1d800524ab09d585
/build/make/core/version_defaults.mk
d8bc190a637353652f5e16abc4f4c972b8dcf60f 21-Mar-2017 Colin Cross <ccross@android.com> Use new naming scheme for TARGET_PLATFORM_VERSION

Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
/build/make/core/version_defaults.mk
f7e320b2237d758e3bd4477518f7e52ad71533ef 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb am: b7baf15d67 am: 5ce9447af1
am: a75eb481bf

Change-Id: I1bc5a195daaff9997e1f58004b5eb6e4a55c4218
ca25ed58d2d0143acccb5407e9ea55788797efef 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e am: e815842343 am: 4fae4a0fb1
am: 93887301f5

Change-Id: I5d339e57c396a90dfde446d7dc1a09c5c39b4e91
a75eb481bf7eac3ce16f1e6800f2b4176d79a7e7 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb am: b7baf15d67
am: 5ce9447af1

Change-Id: Ic8318c3870b238a1a203f986afb9a1250215f03c
93887301f5b97fe7b62576c32600e3e768aa9487 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e am: e815842343
am: 4fae4a0fb1

Change-Id: I738cca37b6f786d557879cbdef5ed2e9458c6023
5ce9447af19356a7adccd8d90fd78572760b1cd5 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7 am: d5894faefd am: f773f981bb
am: b7baf15d67

Change-Id: Ice49d4fef55b52796517b88d8179266728bccf9a
4fae4a0fb13b73cc0c3cf46cbf22d8cadb5b5336 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca am: 368d0a8a42 am: 751d4cd04e
am: e815842343

Change-Id: I08540bc0374762443e18d25830534e4d5103ba1f
f773f981bb5aad1f72ca6c2dde15c5cd42ef7164 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-05 on nyc-dev am: cfdcc41cd7
am: d5894faefd

Change-Id: Ibe7c5aa0d259e9cf2e7cbb9c4a5b5419e3eed283
751d4cd04ef771865741d8be051e41e836ac7061 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-01 on nyc-dev am: 573e7e75ca
am: 368d0a8a42

Change-Id: I009a8d76a744afded3ef11b6c2485d5e7a9d9d31
d5894faefd77916ba926149b925b5d03e9583fe4 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-05 on nyc-dev
am: cfdcc41cd7

Change-Id: I2e1144bca4f0429e06624eadc7a3ca5b83e299d0
368d0a8a42d8ad15f4e3af11897dd048d765b328 16-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-01 on nyc-dev
am: 573e7e75ca

Change-Id: I04549e4c2926780d8e78edca3ca9f98615b00e97
cfdcc41cd73360c9605407508a285c905d196fd5 11-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-05 on nyc-dev

Bug:34137924
/build/make/core/version_defaults.mk
573e7e75cab017946716fbd4ba01cbd8e7563478 11-Mar-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-05-01 on nyc-dev

Bug:34137924
/build/make/core/version_defaults.mk
2afade582d400fb3f5444ce8995f1dd8d5281aa6 15-Mar-2017 Colin Cross <ccross@android.com> resolve merge conflicts of da00e137ec to stage-aosp-master

Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90
b3bfc7172b2adb59ab4fa6ed6dce2e55f7da460c 18-Feb-2017 Colin Cross <ccross@android.com> Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME

Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME from
TARGET_PLATFORM_VERSION. Add explicit values for O, even though
they are the same as the fall backs, as placeholders for future
values.

Bug: 35445510
Test: manual
Merged-In: I30a7142f732c85b637d2ce072373bc867cedcd42
Change-Id: I30a7142f732c85b637d2ce072373bc867cedcd42
/build/make/core/version_defaults.mk
ca0afa36f3afcef278fdde33d0090fd9e7892f68 18-Feb-2017 Colin Cross <ccross@android.com> Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME

Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME from
TARGET_PLATFORM_VERSION. Add explicit values for O, even though
they are the same as the fall backs, as placeholders for future
values.

Bug: 35445510
Test: manual
Change-Id: I30a7142f732c85b637d2ce072373bc867cedcd42
/build/make/core/version_defaults.mk
78cb9787b987048e99106cb6f5d3d6cddd2b5865 22-Feb-2017 Colin Cross <ccross@android.com> Merge "Use ifndef or ifeq () instead of ifeq """ am: 1948f64dd5 am: f78a2f821c
am: 901057d95a

Change-Id: I4f641ce791d64c7fe78e9938462820e7cd3be419
f78a2f821c7bf87f5d37866969bb612ee4b72a16 22-Feb-2017 Colin Cross <ccross@android.com> Merge "Use ifndef or ifeq () instead of ifeq """
am: 1948f64dd5

Change-Id: I0a582b85ae540f9b164c93cf5363049258983a64
63fe36abbee8343e3f11a77785994b4076e12b01 22-Feb-2017 Colin Cross <ccross@android.com> Use ifndef or ifeq () instead of ifeq ""

ifeq with quotes is technically correct make syntax, but rarely used.
Replace it with the simpler ifndef when comparing against empty, or
with parenthesis for consistency.

Test: builds
Change-Id: Idcbe0586c4626c67d560694596b0bd9f5f93484a
/build/make/core/version_defaults.mk
5cf5d36882a24a6af6d470d8261ac92918eaf6f4 17-Feb-2017 Colin Cross <ccross@android.com> Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48 am: 5122f6fd67
am: 653470d457

Change-Id: Id83ed8cdb26736fabc5084f56c8de9e4d797551d
653470d4570b7b953d222b9665e554a4766c51fc 17-Feb-2017 Colin Cross <ccross@android.com> Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b am: 4cfa9fcd48
am: 5122f6fd67

Change-Id: I7e13cea1775538c07e952c5770002777eca010bf
5122f6fd67584b7c7e0250d658747d958b1f539c 17-Feb-2017 Colin Cross <ccross@android.com> Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" am: 738d2de20b
am: 4cfa9fcd48

Change-Id: I9fc141840a2b186b252bd2764344a9e791690ef6
d3183bdf40305dcd6da501d3eb3db0f550705fc2 17-Feb-2017 Colin Cross <ccross@android.com> Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION

Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
/build/make/core/version_defaults.mk
38a84e5e83965d956bc014de0793168caa328197 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92 am: af59a1c806 am: 61a00ef2ba
am: c54e7f5658

Change-Id: Ie30a84ffd6e79ebea5b6461c5eab3432ae075dba
ee986698ad4e2f5b610b2bbaab9fd239c14db189 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528 am: 03dc9a951a am: 570e257352
am: 8ddb562911

Change-Id: I79916ef63c71de877355c6268d8e90f8b222531d
c54e7f5658c927bf7caa1467eda16df45a3067ed 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92 am: af59a1c806
am: 61a00ef2ba

Change-Id: If80382b4934a1828fa4738a21a006012cfa3d7bf
8ddb5629115ff2205d78e21e2c31df38a8185750 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528 am: 03dc9a951a
am: 570e257352

Change-Id: I443c49a8d536c5bfa21f53cabb7687adc2778ef6
61a00ef2ba10e394dd579c9e76fc19d3c6b8d110 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92
am: af59a1c806

Change-Id: Ibae45eca09589a4048389541c121c827b9292cd9
a11bebd35bd6575faa2639e05ad650c1e0dd2f3a 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1 am: e69e40cc34 am: 9cff197d92
am: af59a1c806

Change-Id: I748fa6fff6aa89b847e1c2ac10d8f9384e08b2e2
570e257352bf1955e1fe4490e4af62e184ab5cfd 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528
am: 03dc9a951a

Change-Id: Ic810aa498e9ebf8cf8224c9abfbbc8e11de863a5
3a898f324609c3875a54ffba3ef8dc8aeb55f496 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2 am: b1865c4cac am: 4526457528
am: 03dc9a951a

Change-Id: Icbbad811a05d0812596b8b4678804fc1151a921b
9cff197d9245379dab2dbc5b7ce44feaa6d6bda1 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev am: 8ee3a4cef1
am: e69e40cc34

Change-Id: I7a30fc2fe048aa1e6da8c7ea808961b5437e713d
452645752827bd7e835c745783ba2db96c3851f4 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev am: 93c1a722c2
am: b1865c4cac

Change-Id: I20cd2ed43edee894f4e1e183628392b54c2c9478
e69e40cc34c87bad826007207d94934729cb31e9 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev
am: 8ee3a4cef1

Change-Id: I4f7853e8ce785d41b5f2cd4e67458707e100f056
b1865c4cace58828635665b5f8c338cd04cd2186 14-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev
am: 93c1a722c2

Change-Id: I76d811946e6f9c7bee897a8bd4e8c49e465dd0c1
8ee3a4cef12a15572553d5a3fdda87e3cf9489c2 13-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-05 on nyc-dev

Bug:35314737
/build/make/core/version_defaults.mk
93c1a722c2c579a7360a160c77c754382018f348 13-Feb-2017 Adam Seaton <aseaton@google.com> Update Security String to 2017-04-01 on nyc-dev

Bug:35314737
/build/make/core/version_defaults.mk
6ad2fec88aee5648ba7a96f74fd64b61e9ede902 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9 am: 6bce8b94e6
am: 74ab792ef4

Change-Id: I2d265dbff4aeea7d7c279fe9aa12b087cbbf16b0
59d758b7e35f93177ffa499aa609f9925aae9ab6 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9 am: 8e90b1da24
am: 9dc5de2366

Change-Id: I59f695b65ec0b6b81e4fb5b4ce7494a120804c54
f52af69ee0c46c69ee6d4f2bc515039c593134b2 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49 am: 5793d02c95
am: d26312b3e8

Change-Id: I8fbe93530589d329cda397095ed5cd4f2b7d629c
447da95e58911cf5785489a53953318e6c36d299 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49 am: 9bbbf746ec
am: b7cb7b4f50

Change-Id: If6458c264285531b087801014a1ca177a79ee0e0
72e3501bd47213251796f9d88bdc4c1f04617138 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9
am: 8e90b1da24

Change-Id: Ie167252d0225afec37402e48f13ba039f76b9534
9dc5de23664a0a1339d36869719271c9711004ea 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am: 8e89e568b9
am: 8e90b1da24

Change-Id: Ie7078f8b32a1709360eddc1177474c863fac0968
5ac65adf12e7c60f9271dd4508be47ee2cd9c250 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49
am: 9bbbf746ec

Change-Id: I3e492558fd5271a1661ecac667971f790643b720
b7cb7b4f500fe2bf42e560b51d00c92852c2d518 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am: 54b11f5c49
am: 9bbbf746ec

Change-Id: I192b050d434a8c9f7f1562648fcc809c35650ef2
8e89e568b91410fb35b02b208506cd4a5935b249 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba
am: cb8fef9d91

Change-Id: I57a8e17828c908dcdb588bb4df8e12eeeef45d27
54b11f5c499ed74f08aabc06cadc635b1a7a9815 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev am: 003e5aad03
am: cacce5db57

Change-Id: I090fcc6c3986a07e2a5c6cd49e82b42470ea8002
cb8fef9d91b1cf4dd275ccf097423cefb256bac7 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev
am: 25b39b12ba

Change-Id: I85a8100d821ed89b5c0ee4c347bb09b822c15d8d
cacce5db57898e1f7563a8e2a4fd5b26d5d0314b 18-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev
am: 003e5aad03

Change-Id: I5a7cec00ddc99b9b8791e2e61d21d1936d3afc4c
25b39b12ba5af72080478ba8bd79c9f354cf327d 17-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-05 on nyc-dev

b/34345751

Change-Id: Ieaaccd7b92c85bb3389fab5e03011892bf7fdcba
/build/make/core/version_defaults.mk
003e5aad03b405c7aecc63339c2d7995ddcbaaa9 17-Jan-2017 Adam Seaton <aseaton@google.com> Updating Security String to 2017-03-01 on nyc-dev

b/34345751

Change-Id: I55d9ba3f16264f9e4f9ad72e861527a3f8ae566c
/build/make/core/version_defaults.mk
29d4c009c1334ae4282b7b50c87926f24bd433b5 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e am: 6f5107fc6b
am: 8311e0eb1e

Change-Id: I317568e6344ebe7598c00abb659c06b2bbcd9b66
9cab80893083a7af30dc584c16524539b95ec6f1 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e am: 89e9059995
am: 7b86c49b95

Change-Id: I26116859fa0c0f8b0e07222db491cb2eefd3dfa9
8d1614a04120ce497f18183f6fb861e6d3af1fbf 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5 am: 88add823ae
am: 9c909b1b57

Change-Id: Ie208df18a8fe3ec6824d174c6b44e287270c1f8c
3692e73cd5c49879d9d48efb187579d2828936d0 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5 am: 548f3ec0d3
am: 2af57857b8

Change-Id: I82e29fb23b492962b56659ff2e292c71a6989b10
7b86c49b9570afcd1a8c618196be54f7ef1f8e2d 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
am: 89e9059995

Change-Id: Id11cb447d0331a8643793b932537cb7a154fffb9
94fbbd200e4cdac5901930160a851262095f42c0 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev am: af63566009 am: f6dbc77231 am: dec80c416e
am: 89e9059995

Change-Id: Iee0a4138b5293e3c2ad6b6017548b029a99c88fd
2af57857b87f31e75c834b894b403b37d875e371 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5
am: 548f3ec0d3

Change-Id: I4234646b649f205b257047550b280358ab8f7711
0dd5eff86c8a7200ba2098ce0a34588b15d63f2b 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0 am: eaf4508b09 am: 2cc397f4c5
am: 548f3ec0d3

Change-Id: Idf5473287d764e87705930d0ad439f8b727780cf
dec80c416e990456bf3aef64d98c4363f4bfa432 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev am: af63566009
am: f6dbc77231

Change-Id: I299409eb4369fe127a93ab8392ec847cd4df7f1f
2cc397f4c571e2d94e16ba6377dde8948cdbadf8 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev am: 35901a7fd0
am: eaf4508b09

Change-Id: Iba9c094d3f0b5cc1a234ee43cc96947226f9d219
f6dbc7723124ff2846a49ed22a76d0c9a8d3e37d 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev
am: af63566009

Change-Id: If672e58e906d16e1c863c54fc8b16903ce8df25a
eaf4508b09b2c7181522ccdf71e9b04d86a17217 14-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev
am: 35901a7fd0

Change-Id: I4cb3261d651f82ab13a5aad310562bfcc8f0e4d9
af635660098e5686dd82888fe579d8e3b952cfbc 08-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-05 on nyc-dev

Change-Id: I761c90cd025b2862a3b6fe1cf12e6aebc5fa809f
/build/make/core/version_defaults.mk
35901a7fd0eb5eae6c26cc11291da990364e663d 08-Dec-2016 Adam Seaton <aseaton@google.com> Update Security String to 2017-02-01 on nyc-dev

Change-Id: I0e2dd0afcb6dd490dd81afb879890eeb41bf121d
/build/make/core/version_defaults.mk
0de297d2540720eb62791bd7472cba873a49e717 06-Dec-2016 Benoit Lamarche <benoitlamarche@google.com> resolve merge conflicts of e04c941 to stage-aosp-master am: 0e61b46673
am: dd80dde8d2

Change-Id: Iff9f1ef1653a7a878dee9fb23dc7398e2b3805fc
dd80dde8d22b5a4d4adba8f4692b8980eec91a7f 06-Dec-2016 Benoit Lamarche <benoitlamarche@google.com> resolve merge conflicts of e04c941 to stage-aosp-master
am: 0e61b46673

Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb
0e61b46673ac3e01492132060b1fab35a73e57d5 06-Dec-2016 Benoit Lamarche <benoitlamarche@google.com> resolve merge conflicts of e04c941 to stage-aosp-master

Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
a6c122b5343ba310da8425843542520fbef91a53 18-Nov-2016 Yohann Roussel <yroussel@google.com> Set platform min sdk for Jack to o-b1

Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)

Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
/build/make/core/version_defaults.mk
5360e0160b0c298c36a43a88e0c906571256b308 18-Nov-2016 Yohann Roussel <yroussel@google.com> Set platform min sdk for Jack to o-b1

Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)

Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
/build/make/core/version_defaults.mk
85ad682924123e669672a992716f3c05f8c224a9 24-Nov-2016 Ian Pedowitz <ijpedowitz@google.com> resolve merge conflicts of 6ff975b to master

Test: None (comment only change)
Change-Id: Ib1d948eb7bf9a9638d1989da82a8a3c5c885b5c4
fc0189fec2f0211e8598cdf7a187fb7c649dce61 23-Nov-2016 Ian Pedowitz <ijpedowitz@google.com> Adding in some documentation to ensure files are updated as needed

Also pulls forward the comments added in 9a3d92f71981bfd06816d2cb331f41e783761c43
to nyc-mr2-dev

Bug: 33090697
Bug: 32608129
Test: None (comment only change)
Change-Id: Ic23d099767ad4c711bf2d3586cdefd626dec1ce0
/build/make/core/version_defaults.mk
cea04f3feb85d9721507f2c1f8217967dfdcb7b5 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83 am: 223b79e356 am: 3b6ceb6dc1
am: df350bdb66

Change-Id: I875fa00f0b6359c390bec953dd92703a4c7310f3
6eb7ad5e1020c0785f685b5a2e2a99b8c218ce16 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc am: 2e5e286112 am: 7a83d3131b
am: 3e3c6e34ae

Change-Id: I59b7bf97a357831395c0810c467c35c9eb4da143
3b6ceb6dc13cd51d15ae61f8e7b36e7c31b8b18e 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83
am: 223b79e356

Change-Id: Ib8479d61177d014774b704d9cb416df303d1f766
7a83d3131b699ab58d4513389c638de961aa2806 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc
am: 2e5e286112

Change-Id: I79c96fb8f07692e546ec2004e5d034f7207b9112
091dea5c836d89febd2e975a72453b1174807d2e 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61
am: b9085822a5

Change-Id: I8230fa0c0c13b89274bab56a04b183e4c8b0ebe7
6a954bbdbcff64e2ee1dd45702d7882c4509a007 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e
am: 6108f21d36

Change-Id: Ibac521fa4d9e04c15e8178d9844c970257c11f58
b9085822a5154b4198df1ae9159cdbc77a6b4c2d 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-05 on nyc-dev
am: 190129bc61

Change-Id: I806b3dfebb6dc08059313b979a435684341a759c
6108f21d361221bdd6a6e4c2614f5e8020050532 17-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-01 on nyc-dev
am: 202380f93e

Change-Id: Ib7310ca722b459e385478393c725391907f191f6
190129bc61b35e1b516a5e111d2b14ef8108c023 16-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-05 on nyc-dev

b/32949407
/build/make/core/version_defaults.mk
202380f93e063b0b21b9305ebb3bfbc62c800bfa 16-Nov-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2017-01-01 on nyc-dev
/build/make/core/version_defaults.mk
9a3d92f71981bfd06816d2cb331f41e783761c43 04-Nov-2016 Ian Pedowitz <ijpedowitz@google.com> Adding some documentation to ensure methods are updated when API number is set

Bug: 32608129
Test: None (comment only change)
Change-Id: Ida34b14419e3cb86e3fe07a9cc4b7ccb46d5f5a3
/build/make/core/version_defaults.mk
61be03b456e28df4c2347e4b51fa9616f086e236 01-Nov-2016 Ian Pedowitz <ijpedowitz@google.com> DO NOT MERGE Nougat MR2 is 7.1.2

Fixes: 32335870
Change-Id: I2b0f7e0f9506704a391930f6f9c2a4cf9c550a7f
/build/make/core/version_defaults.mk
16394c3fb42ef0a87e047e70aaaf788fd0371624 21-Oct-2016 Ian Pedowitz <ijpedowitz@google.com> Removing NMR1 from PLATFORM_VERSION_ALL_CODENAMES

This is no longer needed

Bug: 30734691
Test: Compiled
Change-Id: I3ba0732ba6e84fbd697cedd90b16bb558863d29b
/build/make/core/version_defaults.mk
c0b873f822c2b03883941c696f14028282918abc 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-05 am: 38dcf47813 am: 71e1b726e2 am: e6b85b662f am: b7d1dca71b
am: 876a086d62

Change-Id: I195ab1df6240a3a2adcc067272b7587945f6a823
ae616cde3a1f0d8eb5de0f5d8a74cc1056559736 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-01 am: 1f7c92c5db am: c9c0ba7572 am: caee659bc7 am: 8e10972458
am: 88baf588f9

Change-Id: I1daebb14f704ba0a7772e2d443202b58703848e8
e6b85b662f4ae665881ddcd399171f73d95a0508 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-05 am: 38dcf47813
am: 71e1b726e2

Change-Id: I0ae4f763e19f9db41a748aa3ce79775e2bd2946c
caee659bc78e8677b87b039049789d08f89522b6 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-01 am: 1f7c92c5db
am: c9c0ba7572

Change-Id: I4bdf3f3f69f7c2220bd328586e61a75fd765ea5c
71e1b726e2032b33bd48cec4408a8edb418f043f 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-05
am: 38dcf47813

Change-Id: I3fd8785e5b66fc27cf589f9172445081c5051be8
c9c0ba757253cf05e9d91490dd98eeb6bba4aae7 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-01
am: 1f7c92c5db

Change-Id: I48dbe98c5b7ec8270acde0c4bca570cf9acb1ffa
38dcf47813d8cd69f54767d22368bb449b3d1b33 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-05

nyc-dev
b/32249855
/build/make/core/version_defaults.mk
1f7c92c5dbd6342bdbf0649912805ea60ba1d382 19-Oct-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-12-01

nyc-dev
b/32249855
/build/make/core/version_defaults.mk
d6340945436ba154a692f9c7656bdb9cc2ccbb90 30-Sep-2016 Akshay Thakker <aksh@google.com> 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
/build/make/core/version_defaults.mk
3a45e9471b44ff80da0adb48fc78284dd728c685 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating security string to 2016-11-05 on nyc-dev am: 002132648d am: 8f911960cf
am: 55ed6ce833

Change-Id: I824289a7d48c363b6b9e0a283fdf4a3f5b24d4a5
87e7760a3f733eb8db60422113bf4536847c61ec 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-11-01 on nyc-dev am: 2a00b24144 am: f305906a95
am: 0f775c7435

Change-Id: I14e4ebf06b27877fb923238b3d4e1e8c36a73022
55ed6ce8334afa610ccbecd0d8fca256e98e3897 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating security string to 2016-11-05 on nyc-dev am: 002132648d
am: 8f911960cf

Change-Id: Id8d5c8a3351d87873336a5b14e6634d335af0e9f
0f775c74355df94a89cb3ebdaaf5e75a4b611525 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-11-01 on nyc-dev am: 2a00b24144
am: f305906a95

Change-Id: I8a2a223d759402a2d198e34a2f215fa00ab86511
a6071948d8a825baedaf07140e923da6dea50366 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating security string to 2016-11-05 on nyc-dev
am: 002132648d

Change-Id: I35cd90ba6f03e44b7a0197c557c5a348eb013620
7d01908b3b548ddc718eae9b7a9227223195e86e 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-11-01 on nyc-dev
am: 2a00b24144

Change-Id: Iaec891cdaecc040a815e89c3e33623b21e12100b
002132648dfad24acd01130ad5885988d2b15fa5 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating security string to 2016-11-05 on nyc-dev

b/31618336

Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
/build/make/core/version_defaults.mk
2a00b241447b79648a378f46ae2ae50f319bb2b4 21-Sep-2016 Adam Seaton <aseaton@google.com> Updating Security String to 2016-11-01 on nyc-dev

b/31618336

Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
/build/make/core/version_defaults.mk
bc332747817a2448c080a34a91e28b756e41768e 26-Aug-2016 Adam Seaton <aseaton@google.com> Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef am: a43f790608
am: 569906e169

Change-Id: I64a7335ed65d36ce6de90112085340af633ab04f
569906e169003dbedbe8ba60ce161450838a0439 26-Aug-2016 Adam Seaton <aseaton@google.com> Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef
am: a43f790608

Change-Id: I0d7feb17c8f8fd74c73714657417ba03cab74f75
89c03f5748bd6173ebd2c19099dc05b5385f880b 26-Aug-2016 Adam Seaton <aseaton@google.com> Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
am: c63e4295ef

Change-Id: I9cb5cbb053ebb79b08a0d75bff21932bb8eaee33
c63e4295ef685eca81434d2f936c28f7b09843da 26-Aug-2016 Adam Seaton <aseaton@google.com> Update comments around PLATFORM_SECURITY_LEVEL
(nyc-dev)
Bug: 29881091

Change-Id: I2bdaf7f796ab94b14416aaed6d68dc3a239ea5f9
/build/make/core/version_defaults.mk
6e4a224227e1886935ad99ecdaeecb0d940c3edc 19-Aug-2016 Adam Seaton <aseaton@google.com> 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

Change-Id: I7c479cc20694085d70c6c6f6840e0ddc6f16fdc0
424978384836af8ba949fe64616786c69b5faa1d 19-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831
am: 5d6ad4a9ab

Change-Id: I4e854f70d52f87cb809c59c6d73b4f5084bdba87
04c54f1b6555c008788262efa22188e6b5e53a18 19-Aug-2016 Adam Seaton <aseaton@google.com> 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 am: 40a4e23824
am: fec3ff0a40

Change-Id: I4121807145263efa5be6911434d691c9e88d2747
fec3ff0a400d33b7e8823c154252bbf4e6c9f8a6 19-Aug-2016 Adam Seaton <aseaton@google.com> 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
am: 40a4e23824

Change-Id: Id4f4ae211b59b9e0e3e22745a63ec39822a8d95f
68fede2142fe283c68161eca2af7a39d1d8b22c2 19-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88
am: 35e3465433

Change-Id: Ie52eeb02bdfa1f17f3f584ec7fd03c274008037f
eacfc7749b805318f2de3f14c978f20aabf82470 19-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
am: bb45bd20e9

Change-Id: I72826f39c7c5db303106694fd41927e09f1c86d7
4245c26d51826e4cef670b199131b732079c5a88 18-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831 am: 5d6ad4a9ab am: 18bd0c1c17
am: 2ec1dfaa09

Change-Id: I482a33db248b832219c9f2a8bc2c125223c0434f
2ec1dfaa09bd0ac160b89fe793081f41bfe45246 18-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831 am: 5d6ad4a9ab
am: 18bd0c1c17

Change-Id: I6506f2dff265241d1b01020d34a825b2601870af
5d6ad4a9ab29a9b0464e49b9e3b875b9258a0f98 18-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44
am: 7d5d729831

Change-Id: Id24a8f9d8ae01587fd402839a41b6205efa4352e
bb45bd20e97be07ec92facf411aae91d90490a5b 18-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-05 to Platform and CTS for October
Security Updates (rebased)

b/30946906

Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
/build/make/core/version_defaults.mk
e977aadfea55d600fde091d2aa33ccfaa36f2344 18-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-01 to platform and CTS for October Security
am: cb60b2dedb

Change-Id: Ibab3f4e47e05a2ec708105ddc3824df83ea95458
cb60b2dedbf6a346f3affc66a2e89a8068c530e2 18-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-10-01 to platform and CTS for October Security

Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
/build/make/core/version_defaults.mk
719881f2a0c00198b188f06b70846c2122df56e2 15-Aug-2016 Ian Pedowitz <ijpedowitz@google.com> N-DR/N-MR1 is 7.1
am: d0528b4463

Change-Id: I6045d068f33928152b2a50a73678da441249e3f6
6dfac06e2c083fa3e378f02c8248795620d980b1 15-Aug-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev
cfd934bbba96a302d1b6fbd42185af1491299c29 12-Aug-2016 Adam Seaton <aseaton@google.com> 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 am: 7171325d0b
am: bd18f04bd3

Change-Id: I7fd8b9d434b8ed66dafd5f94a36da089c8131cbe
bd18f04bd390c0328d6ce04ee7105305e68db1a5 11-Aug-2016 Adam Seaton <aseaton@google.com> 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
am: 7171325d0b

Change-Id: I114a7c8b86cdddbe1333ceb8ac7668c3ae0b8d10
831bee139dc086c90490a5da714aec17d8c03067 11-Aug-2016 Adam Seaton <aseaton@google.com> 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

Change-Id: Ic5565af400aa3d3c245d5ab25d65a6244a46907d
782967785edce786f43cb168bce23a4e4b474d04 11-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c
am: 1f85078b1e

Change-Id: Id8709a33bf19fb106341a8aed5f2978adf91a7ef
fdf4c8d8a60b9090f5227d3bc5bd78aec1d84eff 11-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am: fa721839b2

Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
fa721839b2b6d89a94540075280193a44cfdc79d 11-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)

Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
/build/make/core/version_defaults.mk
d0528b44631d3da9b72575b4e18f71485811054b 08-Aug-2016 Ian Pedowitz <ijpedowitz@google.com> N-DR/N-MR1 is 7.1

Bug: 30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
/build/make/core/version_defaults.mk
87ea74ca43cd453af4d696a6ca2002fa09d9690b 09-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1 am: 2d033a9e51 am: 76582b95d1
am: 402c6f5eeb

Change-Id: I2504ce465e62ddaedb9cf6291f5b0030b19f247b
402c6f5eebb1fd8f047edee925a7418d6940abd9 09-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1 am: 2d033a9e51
am: 76582b95d1

Change-Id: I824632c35828fb60772af0e8fdc456d93e66f85e
143faf4aa4d4f623fcd356fae4537b11fdfd3b4a 09-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
am: 2d033a9e51

Change-Id: Iacc3e198cff56bdd396a64e594d19e4ca635c3e4
2d033a9e51b6493b868fefe2c22c6acabe6d5db9 09-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5
am: f7de14b8a1

Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
e158db8ad24fa875ffd56ea763d50e87bef51d89 09-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-07 to platform and CTS for September respin
am: a53b868e6e

Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
a53b868e6e6f2317ffcbe94fc3e61abc5d231e6a 09-Aug-2016 Adam Seaton <aseaton@google.com> Update Security String to 2016-09-07 to platform and CTS for September
respin

Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
/build/make/core/version_defaults.mk
ec6f5f03a0c2bd2484e66a14b0af8fa12e8753d0 02-Aug-2016 Adam Seaton <aseaton@google.com> Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH am: 8d4fac76b5 am: dba0aaad5a
am: 3717d0f698

Change-Id: I124c79e824b05d21574eb347f28f57f352e5efd2
8d4fac76b51d5ebd20069fc45103a169ca3c4734 29-Jul-2016 Adam Seaton <aseaton@google.com> Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH

Change-Id: Id4eeaedac02900df7e635f378b54c2e58e9b5c6e
/build/make/core/version_defaults.mk
9e4fcf6eb160a91ddd69a4c81af28741f1783fdb 29-Jul-2016 Adam Seaton <aseaton@google.com> 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 am: 001e51af1d
am: 845465db6f

Change-Id: Iba9bd1ca40accec3ed6e016499a3bffe2f3fa6b4
845465db6f5b84353d4c8c66a6328a997f806519 29-Jul-2016 Adam Seaton <aseaton@google.com> 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
am: 001e51af1d

Change-Id: I9c94a53b702394cac0e51ece3ef128c5a97ec771
bddec86ed936d81f12a90ac7a674c35f8d17ff43 29-Jul-2016 Adam Seaton <aseaton@google.com> 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

Change-Id: I7172d0aef5029648ad1d7792eaa9e291ab41ec97
f25aadc812cad0b550d6ec26b8384e7b43c01904 29-Jul-2016 Adam Seaton <aseaton@google.com> 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

Change-Id: Id5b440e150d514e85ee28aab7830d1d94e8cc5b9
63ec9d8f239cab9c2ac82893e55f70af393d9ce6 29-Jul-2016 Adam Seaton <aseaton@google.com> 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
525c6aa5417895e207d92dfd346fbfd0035d9793 28-Jul-2016 Adam Seaton <aseaton@google.com> 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
/build/make/core/version_defaults.mk
e8d4b9377dcf50310a472a83505e371521c8ee48 21-Jul-2016 Zach Jang <zachjang@google.com> 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 am: a212b9c250
am: 4c14391dbb

Change-Id: I1bf20906f3258e01723cdd1e1dbf14fc2f69bc8d
a212b9c2503cb1f559c8da6d6b3b24f274bd8baf 21-Jul-2016 Zach Jang <zachjang@google.com> 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

Change-Id: Ia894b80e649552407714a685c2c33082204fb474
37c17db1c6ce69b6577a9db56c8ea3c383f0ee7b 21-Jul-2016 Zach Jang <zachjang@google.com> 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

Change-Id: I92f956bcbd342f0fa953fed5ffb6d1462bbe3c4c
942c341ab19560e3c2d3e2d1b0b0a6558d98dce9 20-Jul-2016 Zach Jang <zachjang@google.com> 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
ee6b57f523ee8441316727047fe3a5d905235051 19-Jul-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA

b/30224278

Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
/build/make/core/version_defaults.mk
d325ccef0f4b4f8fb13f1a4d88a3fe14e0a7a632 06-Jul-2016 Ian Pedowitz <ijpedowitz@google.com> resolve merge conflicts of 29fe197 to master

Change-Id: I44e73b53e3cd05faf70412f31bc95d60a1200916
14c2a1586b03b1b03a3f36ed626d93f6d32687e7 06-Jul-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev
3b546839247b862474a6d5c6638659adffcc7881 05-Jul-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""

This reverts commit 266600b6391a142c1127db2c2dd738cb1bc7a0df.

Bug: 29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
/build/make/core/version_defaults.mk
58b782cd88a976fb417fa986b41d30e5d55b7895 01-Jul-2016 Michael Wright <michaelwr@google.com> N MR1 is API 25 am: bcdc880ca9
am: 72d7a2853a

Change-Id: I7203d1fbe71ac6ab49c30d3743453b1115d36e6c
bcdc880ca9863da19f6bbd67b6f78784d805fe9d 29-Jun-2016 Michael Wright <michaelwr@google.com> N MR1 is API 25

Bug: 29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
/build/make/core/version_defaults.mk
47383ac698977ba6bef721720ef36b6a035bc9ca 24-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev
cd7d49f939a8417686d636900753c364e06ddcb7 24-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""

This reverts commit 091fa1edc91a45413650c7243f16d2aa82e1f61f.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Ia127709ada69444a6c252f3e583835d4a4fcbeb8
/build/make/core/version_defaults.mk
266600b6391a142c1127db2c2dd738cb1bc7a0df 24-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""

This reverts commit 369efe3d84f059ba41560d6522520c747f1274b2.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd
/build/make/core/version_defaults.mk
091fa1edc91a45413650c7243f16d2aa82e1f61f 23-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""

This reverts commit dc15ebc26cbf88dcba74aea1f005a1794c779ee6.

Fixes: 29117805
Bug: 28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
/build/make/core/version_defaults.mk
7b352c1d704fe73e2e5c11af102f8dd9a07a1464 24-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev
369efe3d84f059ba41560d6522520c747f1274b2 23-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""

This reverts commit dc15ebc26cbf88dcba74aea1f005a1794c779ee6.

Fixes: 29117805
Bug: 28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
/build/make/core/version_defaults.mk
b03ba8da3e49eb081af2507021815d339bc06f0d 22-Jun-2016 Zach Jang <zachjang@google.com> 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 am: a36f36dcc0
am: 248a5b2bf9

Change-Id: I32697586cd1781d60b6b3ad6309acb38d2d176cb
248a5b2bf92792fb72ccaa3048d1b63c662feee7 22-Jun-2016 Zach Jang <zachjang@google.com> 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
am: a36f36dcc0

Change-Id: If03ecbb95d14127d9534aecd20da984b2fd65d1c
113239bed6ea5e87806a9e246f70ec708b7cf741 22-Jun-2016 Zach Jang <zachjang@google.com> 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

Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
1f87a820ad227befc84f6a2a11fa73333f8deb5f 22-Jun-2016 Zach Jang <zachjang@google.com> resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db
am: 1be6c69524

Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
3749025ccbbc0776fe10c5813262ed771e7185b6 22-Jun-2016 Zach Jang <zachjang@google.com> resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94
am: 9fc3cf7ba2

Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
9fc3cf7ba21d0877372f682a6a0c7db2a2294c1c 22-Jun-2016 Zach Jang <zachjang@google.com> resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29
am: cbf1e2cc94

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
0c672afc4052f162eab990fa5bd97f09ab2f927c 22-Jun-2016 Zach Jang <zachjang@google.com> resolve merge conflicts of 12db224 to lmp-mr1-dev

Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
12db22426993ccd0470f551c8ac05fbdbf0e9447 22-Jun-2016 Zach Jang <zachjang@google.com> resolve merge conflicts of 24cfbfa to lmp-dev

Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
24cfbfabb760c366c3e8f6bff921d3d9a977adcf 22-Jun-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-08-05 am: 5b14c1f7ce
am: 26acdf0c13

Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
5b14c1f7ce579799357f089d9301f0cfcc41b656 20-Jun-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-08-05

b/29513589

Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
/build/make/core/version_defaults.mk
dc15ebc26cbf88dcba74aea1f005a1794c779ee6 08-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"

This reverts commit 5fcdec083edf0eb3cbc8cdf05626d1713df677f1.

Bug: 29194920
Bug: 28809789
/build/make/core/version_defaults.mk
0c822614f5db9b1e1426e5888e5b2b537e015fbb 08-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
ddc0c5e0a0b65b4ce9bb5a295a49caf565b87857 08-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
7a5075773145704fbc08dbb08bd6e859e04e9859 01-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> NYC is 7.0

Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
/build/make/core/version_defaults.mk
5fcdec083edf0eb3cbc8cdf05626d1713df677f1 06-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Removing N from PLATFORM_VERSION_ALL_CODENAMES

Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes: 29117805
/build/make/core/version_defaults.mk
4a0723af3c8ba4a90ee35aca7bdc0a2c46c52dc3 03-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> resolve merge conflicts of 364e42e to master

Change-Id: I0d742baa230d2d55b34de4f4a7a441dfb214d133
637c0192fcede4e91b4040bf9c486dfe1fb93d74 03-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> resolve merge conflicts of f2304ce to nyc-mr1-dev

Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
216b1ed2f515c4b7fb97f17a59660b0a44dcdd71 03-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev
f2304ce36778a95793b48fb9ccf83f6b03c19433 01-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> NYC is now REL

PLATFORM_VERSION_ALL_CODENAMES needs to include N for now

Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
/build/make/core/version_defaults.mk
980588ee8d6f12d2742c5a95795a0c028a715e96 01-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Setting PLATFORM_VERSION(_CODENAME)? to O for master

Bug: 28713307
Change-Id: I6c566aeea3481413f30f155a08ae3226a50a4190
/build/make/core/version_defaults.mk
a9bc05203223a149766314251077f492c360dde5 01-Jun-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""

This reverts commit 295ad1f1f160e229417d604e62483e1871f20f4a.

Bug: 28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
/build/make/core/version_defaults.mk
b9e064bf9ca0d79a32312aff97440e7ce7d70918 26-May-2016 Adam Powell <adamp@google.com> Merge "N is API 24" into nyc-dev am: f211cae2ed am: 4ea89b7e6c
am: 69cab26059

* commit '69cab26059912a8425d963d93feb2fda610fc8bf':
N is API 24

Change-Id: Iea2c05751b93ad4c143e884616153109dee6b31a
69cab26059912a8425d963d93feb2fda610fc8bf 26-May-2016 Adam Powell <adamp@google.com> Merge "N is API 24" into nyc-dev am: f211cae2ed
am: 4ea89b7e6c

* commit '4ea89b7e6c72a8e2c7feb14a5988ed0ccbe7600a':
N is API 24

Change-Id: If64938bf40a631c809e522960de9f6eab49e04b6
233e8ae7624019592d1d090ceed4a39fee07b80a 26-May-2016 Adam Powell <adamp@google.com> Merge "N is API 24" into nyc-dev
am: f211cae2ed

* commit 'f211cae2ede701b58228ff0090bb894f17c0557f':
N is API 24

Change-Id: I8c04bfc700731a1441365f8d0d86a2c54aa3a305
f211cae2ede701b58228ff0090bb894f17c0557f 26-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "N is API 24" into nyc-dev
891d86d4929682d23229b16deb1d81aaffc70fe0 26-May-2016 Adam Powell <adamp@google.com> N is API 24

Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
/build/make/core/version_defaults.mk
d50770bc036609aca1b11911388985f29d24ca62 25-May-2016 Zach Jang <zachjang@google.com> Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401 am: e29b42ffef am: 2be52191be
am: ebf41a3a8b

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

Change-Id: I0753d0c4a1cadeb38eca5f85f6702d6e76878551
ebf41a3a8b0ca8147756ba98b91742921c09efbe 25-May-2016 Zach Jang <zachjang@google.com> Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401 am: e29b42ffef
am: 2be52191be

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

Change-Id: Iee8b639a565f02cc4e943d7388eb906b88c55e75
7b164ae47e9300ab9dcd9713d770095a5db4e333 25-May-2016 Zach Jang <zachjang@google.com> Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401
am: e29b42ffef

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

Change-Id: Ide9c0807d54ed1bab3dc65e0f1c04a4bb856ace2
e29b42ffef47991c090ca8008a9addb9e479fc2a 25-May-2016 Zach Jang <zachjang@google.com> Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd
am: cf227d4401

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

Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
db34ed5f83efc646f37eae8ee61233ee2c2e4979 25-May-2016 Zach Jang <zachjang@google.com> 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
bf5d08ecf4cce47611ee58dbe6b0685e04725c87 25-May-2016 Zach Jang <zachjang@google.com> 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
60270ec78531308f91221ca09c74edee6701ec34 25-May-2016 Zach Jang <zachjang@google.com> 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
f885e95375a48aeefd7d2451a5c61a48100bac77 25-May-2016 Zach Jang <zachjang@google.com> DO NOT MERGE Updating security string to 2016-07-05

b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6
/build/make/core/version_defaults.mk
ea3b024d7daa0e2e177605eb4c38e0044128df20 25-May-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-07-05

b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
/build/make/core/version_defaults.mk
455532e86787789699a02816ea9c7b91a9b8499a 24-May-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c am: f8a869d5d8 am: fbf01117d3
am: 94034c57ed

* commit '94034c57ed55cd061fc53bb752a2f2903f17e7cd':
Updating security string to 2016-07-01

Change-Id: I0b22b63a14f05779f9368190d7ce075bd19007c1
fbf01117d35469f273dbe1465f1e9450917637dc 24-May-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c
am: f8a869d5d8

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

Change-Id: I6f30c8da2bb3476dcb2a0d3e5befca81dbd66c0d
f8a869d5d8a3989e240cde063322f9441ad35d16 24-May-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c
am: 3ffee87b5c

* commit '3ffee87b5cd468aa5bf14a3e326aa080948db4f3':
Updating security string to 2016-07-01

Change-Id: Id3468f4dbeb626ad3289f5acef32a72e3e18201b
608f329e0718a9ef3ed89b3f9d4768b003bc88de 24-May-2016 Zach Jang <zachjang@google.com> 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
3e082f1e649821f00ec751824e901f64a2756269 24-May-2016 Zach Jang <zachjang@google.com> 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
2ee84bf0a56984323154411d60096b691c66b841 24-May-2016 Zach Jang <zachjang@google.com> 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
45ff24a04bd5d3af706ae3aa6266106560070a3d 23-May-2016 Zach Jang <zachjang@google.com> Updating security string to 2016-07-01

b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
/build/make/core/version_defaults.mk
89f6f7aa01591e8524ef0c4b5efa7433d082a9b9 23-May-2016 Zach Jang <zachjang@google.com> DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
/build/make/core/version_defaults.mk
fef5f8e92b93d1cd6101697514a8b1eae66d6809 18-May-2016 Tao Bao <tbao@google.com> Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"

This reverts commit 439971af5d63b1c5175f14f15f99394a95e34496.

Bug: 28713307
Bug: 28817009
Bug: 28767393
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
(cherry picked from commit 295ad1f1f160e229417d604e62483e1871f20f4a)
/build/make/core/version_defaults.mk
301d87850ed543b4cbc83f1f47ceda32738382b5 19-May-2016 Ian Pedowitz <ijpedowitz@google.com> Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master"

This reverts commit 1a737095c1d2e0224b45f4a4757d549f8142cd4a.

Bug: 28713307
Bug: 28767393
Change-Id: I355e7e6b9c785f7ca92d13eea7730449cfe80653
/build/make/core/version_defaults.mk
295ad1f1f160e229417d604e62483e1871f20f4a 18-May-2016 Tao Bao <tbao@google.com> Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"

This reverts commit 439971af5d63b1c5175f14f15f99394a95e34496.

Bug: 28713307
Bug: 28817009
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
/build/make/core/version_defaults.mk
1a737095c1d2e0224b45f4a4757d549f8142cd4a 12-May-2016 Ian Pedowitz <ijpedowitz@google.com> Setting PLATFORM_VERSION(_CODENAME)? to O for master

Change-Id: Ie1385085be01bb8cae6f088e886d680b86e50993
/build/make/core/version_defaults.mk
d93aba9a39c6696fc33fda1f8b868753f7bf6ed0 12-May-2016 Ian Pedowitz <ijpedowitz@google.com> PLATFORM_PREVIEW_SDK_VERSION should be 1 for nyc-mr1-dev for their DP

Bug: 27150977
Change-Id: I735fbb19e68097c17641a01d660780aff1c7748d
/build/make/core/version_defaults.mk
5363df9efa02e3fa593ca5ef545335f44c63458b 12-May-2016 Ian Pedowitz <ijpedowitz@google.com> Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev
am: 77df46efec

* commit '77df46efec7996325cbdb17b67bcecbbe88bfa6b':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Change-Id: I8a7d147837e098b05afd1c098883c53a0dcbce5c
8313541c65d59d0fd3d478e98ed52033cf429f88 12-May-2016 Ian Pedowitz <ijpedowitz@google.com> PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4

Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
/build/make/core/version_defaults.mk
439971af5d63b1c5175f14f15f99394a95e34496 11-May-2016 Ian Pedowitz <ijpedowitz@google.com> Setting PLATFORM_VERSION(_CODENAME)? to NMR1

Fixes: 28713307
Change-Id: I2ba31d71f7e01391f9167b6cc0fe4de61df7b378
/build/make/core/version_defaults.mk
2c7fd2d17098653743867be2b02b305b8220ed06 28-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev
b5658074c334cf8a1ae16f8f9eae22d1a81e605c 21-Apr-2016 Zach Jang <zachjang@google.com> Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579
am: 3f578d2

* commit '3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
Update security patch string to 2016-06-01

Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
63398dd7ea01ea331e2ea362c3235b79fefd5cfe 20-Apr-2016 Zach Jang <zachjang@google.com> Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77
am: d4b8d2b

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

Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
d4b8d2b59f804544e09cb3e600ff290792470999 20-Apr-2016 Zach Jang <zachjang@google.com> Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757
am: 05a8c77

* commit '05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01

Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
0a3b3d40c10e76e75d11a0c3cddc3ea637871886 19-Apr-2016 Zach Jang <zachjang@google.com> Update security patch string to 2016-06-01

b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
/build/make/core/version_defaults.mk
839ec10bbc67c84ca35fe9cb8a56b087f344522e 08-Apr-2016 Ian Pedowitz <ijpedowitz@google.com> PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3

Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
/build/make/core/version_defaults.mk
f041559cd439f435ac06d38d7e400178c6182714 17-Mar-2016 Shawn Willden <swillden@google.com> Describe required format for for PLATFORM_SECURITY_PATCH

Hardware-backed keystore attestation and version binding rely on
PLATFORM_SECURITY_PATCH having the format YYYY-MM-DD.

Bug: 22914603
Change-Id: If116e3ca5611920021b098d6b610ae609956aa5c
/build/make/core/version_defaults.mk
901590ae2aea651be1f5cc972674a3ba8d8ee430 23-Mar-2016 Zach Jang <zachjang@google.com> Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d am: 0cf7987
am: ae7c301

* commit 'ae7c3010265171b2c215c5a30049320ba50265a7':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
f32d07dd9328401525e333a34464a1d1f363e524 23-Mar-2016 Zach Jang <zachjang@google.com> Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea
am: 6bbd684

* commit '6bbd684464a1307f074e6c173a9147d6e2a626f1':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
6bbd684464a1307f074e6c173a9147d6e2a626f1 23-Mar-2016 Zach Jang <zachjang@google.com> Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483
am: 08d9bea

* commit '08d9bea41096f7c055cf67860a07436da6712b01':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
6faa48a0b525d32d78f1f43a1dfd9e4c02104e42 22-Mar-2016 Zach Jang <zachjang@google.com> 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 am: b90d094 am: fa24625 am: d7bf980 am: 87582a8
am: 880e914

* commit '880e914ec6b8ce053ad5b766a2907afaf0c79673':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
d7bf9800f4f5fdc83b2ffb163207025459b26b36 22-Mar-2016 Zach Jang <zachjang@google.com> 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 am: b90d094
am: fa24625

* commit 'fa2462551694090da0d0c941d805165c2e2f6dc2':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
fa2462551694090da0d0c941d805165c2e2f6dc2 22-Mar-2016 Zach Jang <zachjang@google.com> 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
am: b90d094

* commit 'b90d09439a5901f78e9eae332f163cdc1ff98f49':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
175b7800f484edceee404abf21973859d5793c0d 22-Mar-2016 Zach Jang <zachjang@google.com> Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
/build/make/core/version_defaults.mk
569eec09f557c1b87e288661ef99df71e35cba26 18-Mar-2016 Zach Jang <zachjang@google.com> Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5 am: bbf3687 am: b294912
am: d35bff2

* commit 'd35bff2b9a370bcefd82b0ff0960d90678c7942f':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
bbf3687eb83878bbba380799c9f25af1b227bee6 18-Mar-2016 Zach Jang <zachjang@google.com> Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724
am: 592d1c5

* commit '592d1c5a46b95015ec831febc953b17b721383e9':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
592d1c5a46b95015ec831febc953b17b721383e9 18-Mar-2016 Zach Jang <zachjang@google.com> Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd
am: 5b24724

* commit '5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2b71be536b6de0d16d0ae3224d1b00c41bec467e 18-Mar-2016 Zach Jang <zachjang@google.com> 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
/build/make/core/version_defaults.mk
7a498bafff136f1996042c6794ababcaff11d600 18-Mar-2016 Zach Jang <zachjang@google.com> Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2

b/27724091

Change-Id: If448a426d78388208e15254ef30b42873a729647
/build/make/core/version_defaults.mk
740ec8fe8a05fdf19634e52bbcea2ecb1a46ba33 09-Mar-2016 Yohann Roussel <yroussel@google.com> Inform Jack of the min sdk

Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864

(cherry picked from commit c6383d6ec665a0d0c7c866890845c5735a298b6b)

Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
/build/make/core/version_defaults.mk
e5df61318e43302c0dade438aa8ede285e5039cc 12-Mar-2016 Ian Pedowitz <ijpedowitz@google.com> PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2

Bug: 27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20
/build/make/core/version_defaults.mk
17edabb1834474e68634d260ec057fe457a3dc6b 19-Feb-2016 Zach Jang <zachjang@google.com> Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45 am: 3f53b385de am: fc30358acb
am: c4d9b64a68

* commit 'c4d9b64a686dbfbc8e2f91d96203a7328249f5dd':
Updating security string patch to 2016-04-01
3f53b385dec6b45d0e4d07a29ce43b3c510b1d10 19-Feb-2016 Zach Jang <zachjang@google.com> Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
am: eb651e2e45

* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
Updating security string patch to 2016-04-01
eb651e2e450f1756e6acea4f570379af7d146920 19-Feb-2016 Zach Jang <zachjang@google.com> Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
Updating security string patch to 2016-04-01
e182d2a95c52e37d2a6f924c8ff386b52b08a0c9 19-Feb-2016 Zach Jang <zachjang@google.com> Updating security string patch to 2016-04-01

b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
/build/make/core/version_defaults.mk
c6c48b01d9e542adee8a2f757ff6e191a6eed997 13-Jan-2016 Zach Jang <zachjang@google.com> Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9 am: b0b568b5c8
am: a9ac12d276

* commit 'a9ac12d276448e30cadf34099dea7001d67a2c43':
Updating security patch string to 2016-03-01
a9ac12d276448e30cadf34099dea7001d67a2c43 12-Jan-2016 Zach Jang <zachjang@google.com> Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9
am: b0b568b5c8

* commit 'b0b568b5c8731e40c53a6bfc3149a3720d1a2570':
Updating security patch string to 2016-03-01
6c61548bb7e426704760c9351e3211fb45d67dae 12-Jan-2016 Zach Jang <zachjang@google.com> Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
am: c9da4cce57

* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
Updating security patch string to 2016-03-01
c9da4cce57d387f52b675d1024459af5e73c6dbc 12-Jan-2016 Zach Jang <zachjang@google.com> Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
am: 53e7d9bf7f

* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
Updating security patch string to 2016-03-01
c24c6ccd4d5de8be010b74b9021b8fdb926e1dad 12-Jan-2016 Zach Jang <zachjang@google.com> Updating security patch string to 2016-03-01

b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
/build/make/core/version_defaults.mk
9e11eed0d7d7186ddcc0705afa3866c374b9045d 06-Jan-2016 Ian Pedowitz <ijpedowitz@google.com> Bumping PLATFORM_PREVIEW_SDK_VERSION to 1 for NYC

Change-Id: Ie712ea5048f0439e09775fbf645ae3fb1ff31583
/build/make/core/version_defaults.mk
31a792467c26b342f1893d7ef89bb95c6845ca3f 17-Dec-2015 Ying Wang <wangying@android.com> Merge "make USER limited to 6 characters when generating BUILD_NUMBER" am: e9430e2361
am: 71aaa02533

* commit '71aaa02533a5a4c91bb360d4f5cfa9d11dc2c160':
make USER limited to 6 characters when generating BUILD_NUMBER
71aaa02533a5a4c91bb360d4f5cfa9d11dc2c160 16-Dec-2015 Ying Wang <wangying@android.com> Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
am: e9430e2361

* commit 'e9430e2361d152cae00e779fd055454fc0acf209':
make USER limited to 6 characters when generating BUILD_NUMBER
e9430e2361d152cae00e779fd055454fc0acf209 16-Dec-2015 Ying Wang <wangying@android.com> Merge "make USER limited to 6 characters when generating BUILD_NUMBER"
c9219c2c73561e155d7ba5438d01f82bdfbb9184 15-Dec-2015 weiqiao <qiaowei224@gmail.com> make USER limited to 6 characters when generating BUILD_NUMBER

BUILD_NUMBER is use to generate ro.build.description and
ro.build.display.id, if USER is long, these properties will
exceed 91 characters easily.

Change-Id: I7f99ef351f80210172a873104edd980b36c3f8f1
Signed-off-by: weiqiao <qiaowei224@gmail.com>
/build/make/core/version_defaults.mk
153f367416e5ffcf88433b98a047f8ed1341c9fd 10-Dec-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11 am: 8b5be4dd4f am: 1536565dc3 am: 61fc840849
am: 96c1a8cf01

* commit '96c1a8cf01fbc00b7c888d9ad1192509498a9b9d':
Update Security String to 2016-02-01
96c1a8cf01fbc00b7c888d9ad1192509498a9b9d 10-Dec-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11 am: 8b5be4dd4f am: 1536565dc3
am: 61fc840849

* commit '61fc840849a617ddca29189b40169abbc88544f3':
Update Security String to 2016-02-01
5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76 09-Dec-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-02-01
am: f0f73c06e2

* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
Update Security String to 2016-02-01
929a4abd2b777715bc730593aee87643a30706d6 09-Dec-2015 Zach Jang <zachjang@google.com> DO NOT MERGE - Update security string to 2016-02-01

b/26110717

Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
/build/make/core/version_defaults.mk
f0f73c06e25e17ecf8e06f42c51efac102597f57 09-Dec-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-02-01

b/26110717

Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
/build/make/core/version_defaults.mk
26c6d47865819beb2fc4a0c0bcbf0bac08842f12 21-Nov-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1 am: 3ce70dfe46 am: 10c8949d75 am: daf00af42d
am: c2aae56b82

* commit 'c2aae56b82322b2dd5322e0d18dce58fd5f8a838':
Update Security String to 2016-01-01 to mnc-dev
c2aae56b82322b2dd5322e0d18dce58fd5f8a838 21-Nov-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1 am: 3ce70dfe46 am: 10c8949d75
am: daf00af42d

* commit 'daf00af42d67098918a0c06b27002255cc5d34de':
Update Security String to 2016-01-01 to mnc-dev
bcf2866fb1ea50ea31ede70f62b864332f61b980 21-Nov-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-01-01 to mnc-dev
am: 170459f438

* commit '170459f4385d35dd991549e1b545c376ca8df281':
Update Security String to 2016-01-01 to mnc-dev
170459f4385d35dd991549e1b545c376ca8df281 20-Nov-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-01-01 to mnc-dev

http://b/25819582

Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
/build/make/core/version_defaults.mk
58cdbdc5ad54f9c26d94860c2d0be712f88a8f07 20-Nov-2015 Zach Jang <zachjang@google.com> Update Security String to 2016-01-01 - DO NOT MERGE

http://b/25819582

Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
/build/make/core/version_defaults.mk
1a4deadf349b388064f52c0ebdf78ae0d75f52cb 15-Nov-2015 Bart Sears <bsears@google.com> Revert "Change version back to 6.0" am: 55a149b740 am: 550b317688
am: 7b67e0dd73

* commit '7b67e0dd73766dcceb77fa08ae2d8da1341b3c87':
Revert "Change version back to 6.0"
d30b162002e3b2165a89eadd34c2ae7c478f1879 15-Nov-2015 Bart Sears <bsears@google.com> Change version back to 6.0 am: 970f203b3d am: 3a37a0cefd
am: e373f066fb

* commit 'e373f066fbc4b96fd836d3a6e08e582ece8a0a2d':
Change version back to 6.0
55a149b74064b799efe9c69211a511725cb9925b 15-Nov-2015 Bart Sears <bsears@google.com> Revert "Change version back to 6.0"

This reverts commit 970f203b3d3f17b778749c3ce47eb6b922aa606c.

Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
/build/make/core/version_defaults.mk
970f203b3d3f17b778749c3ce47eb6b922aa606c 15-Nov-2015 Bart Sears <bsears@google.com> Change version back to 6.0

Temporarily set the version back to 6.0 and security patch to
2015-11-01.

Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
/build/make/core/version_defaults.mk
14065788477dfb56ac453eace905ba5c3c016143 10-Nov-2015 Ian Pedowitz <ijpedowitz@google.com> Change PLATFORM_VERSION from NYC to N

But won't someone think of the cheesecake?

Bug: 25558821
Change-Id: Icf0adcb5b429a517fdbddb0d137d396a2d168c7c
/build/make/core/version_defaults.mk
632d0e4ef2a654b8485e5ea8cd134df7cdb69ed7 23-Oct-2015 Zach Jang <zachjang@google.com> Update security string to 2015-12-01 am: 0f1512bc03 am: 7b4c7fe5b7 am: 5e994e0d9c
am: dca5dd4f79

* commit 'dca5dd4f795d6f47591370c1ad27d45b2432b208':
Update security string to 2015-12-01
36bf4976bb5916d2e619009e3e5732a3f578fd70 23-Oct-2015 Ian Pedowitz <ijpedowitz@google.com> Bump Android to 6.0.1 am: 0a20c942c4 am: 1f9ba9f89e
am: 4919ed4afc

* commit '4919ed4afc0c289683bfb4932640f6f9b52ed9c7':
Bump Android to 6.0.1
dca5dd4f795d6f47591370c1ad27d45b2432b208 23-Oct-2015 Zach Jang <zachjang@google.com> Update security string to 2015-12-01 am: 0f1512bc03 am: 7b4c7fe5b7
am: 5e994e0d9c

* commit '5e994e0d9cb29bbb5e57bb4389086a6e106f6acd':
Update security string to 2015-12-01
19eec071220298786b345788bce3dc93e233b9d6 23-Oct-2015 Zach Jang <zachjang@google.com> Update security string to 2015-12-01

Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
/build/make/core/version_defaults.mk
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd 23-Oct-2015 Zach Jang <zachjang@google.com> Update security string to 2015-12-01 - DO NOT MERGE

Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
/build/make/core/version_defaults.mk
0a20c942c4bb110ebd971e7959ed1b2fa53e452a 10-Oct-2015 Ian Pedowitz <ijpedowitz@google.com> Bump Android to 6.0.1

Bug: 24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
/build/make/core/version_defaults.mk
0f1512bc03b7820a2b9b93757a2309fb872f6677 20-Oct-2015 Zach Jang <zachjang@google.com> Update security string to 2015-12-01

Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
/build/make/core/version_defaults.mk
934b8ac9e9154d87308c62fa3e794b1ab31010d2 06-Oct-2015 Zach Jang <zachjang@google.com> am f414f45e: am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01

* commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84':
Reverting Android Security Patch Level string back to 2015-10-01
f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84 06-Oct-2015 Zach Jang <zachjang@google.com> am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01

* commit 'a78d357d185c1bd45e52ad110d59b53540f2949c':
Reverting Android Security Patch Level string back to 2015-10-01
124a59aecc0323c1c80469c3ad5d22305c279a49 06-Oct-2015 Zach Jang <zachjang@google.com> Reverting Android Security Patch Level string back to 2015-10-01

Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
/build/make/core/version_defaults.mk
9051863088f361d61357550c770c80877dc64f0f 28-Sep-2015 Zach Jang <zachjang@google.com> am 80dd5c72: am 134b372c: am 3ab46587: am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev

* commit '80dd5c72a6a356fa7a71e614b5b9a329a8c07998':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
80dd5c72a6a356fa7a71e614b5b9a329a8c07998 28-Sep-2015 Zach Jang <zachjang@google.com> am 134b372c: am 3ab46587: am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev

* commit '134b372c09ad16f9aba154e3a14ff24f11010f7a':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
1a78a8e7fbf7305416131c88a4a7093efb2da204 22-Sep-2015 Zach Jang <zachjang@google.com> Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA

Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
/build/make/core/version_defaults.mk
ab095b445af361911df2856e77f43c4cf103a0e2 21-Sep-2015 Zach Jang <zachjang@google.com> 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
e539537d8c7a4288f40afa9226787b9af3d4416b 17-Sep-2015 Zach Jang <zachjang@google.com> 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
47ef4c3467e4f895b776fb0e8dbcba8f90a9398c 12-Sep-2015 Zach Jang <zachjang@google.com> DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
/build/make/core/version_defaults.mk
4c710cbe7f5786c3df396ea4283da920fd5c351b 12-Sep-2015 Zach Jang <zachjang@google.com> DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
/build/make/core/version_defaults.mk
6271608089d67f23654c9ed8b18f3d765518806a 03-Sep-2015 Zach Jang <zachjang@google.com> am ea9ea8fa: am cf7e78cc: am 36890dac: am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev

* commit 'ea9ea8fafb4f52c9012ecb0f5650b29f3301bdc5':
Set the Security Patch level with Oct 1 for MNC
ea9ea8fafb4f52c9012ecb0f5650b29f3301bdc5 03-Sep-2015 Zach Jang <zachjang@google.com> am cf7e78cc: am 36890dac: am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev

* commit 'cf7e78cca06b3edc17270eb3bf6715126afd98da':
Set the Security Patch level with Oct 1 for MNC
4d034675f07e5726a676875b385e863f91c816f6 31-Aug-2015 Zach Jang <zachjang@google.com> Set the Security Patch level with Oct 1 for MNC

- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC

Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
/build/make/core/version_defaults.mk
88bfda129bc5aa8dbb2e85791883573d7abd9fee 26-Aug-2015 Bart Sears <bsears@google.com> am b0eed1a7: am e23a407b: am 8239d21b: am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev

* commit 'b0eed1a70e9244fba5780ee10c5b91ef029ce919':
Set the Security Patch level for MNC
b0eed1a70e9244fba5780ee10c5b91ef029ce919 26-Aug-2015 Bart Sears <bsears@google.com> am e23a407b: am 8239d21b: am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev

* commit 'e23a407b2d3153268b81a89d5755d23eb8a483b4':
Set the Security Patch level for MNC
0bb3145b56ac4b44b26255e9ef5b69e67e35bba1 25-Aug-2015 Bart Sears <bsears@google.com> Set the Security Patch level for MNC

MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.

Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
/build/make/core/version_defaults.mk
dd122b1ea2ec3f0b8c4230f8c0c1ca06799e4e19 18-Aug-2015 Dan Willemsen <dwillemsen@google.com> am 014719fc: resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp

* commit '014719fcfc240910fa216c39826b95d712468183':
Use repeatable timestamps
014719fcfc240910fa216c39826b95d712468183 18-Aug-2015 Dan Willemsen <dwillemsen@google.com> resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp

Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
5971fe347695d18367e75b814a53b5c4d62e6387 13-Aug-2015 Qiwen Zhao <zhao@google.com> Merge commit '68e0bbf9'

Change-Id: I04f361807f8568bc87c4d035d52594eff16955fa
25abc5a38e2e7f2962463aa4e5cd407ecdde689c 13-Aug-2015 Dianne Hackborn <hackbod@google.com> Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
e593e5c42a30aabb92fd2762e647a1024ca5d823 13-Aug-2015 Dianne Hackborn <hackbod@google.com> Fix issie #23116383: Include security patch level in Settings

Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
/build/make/core/version_defaults.mk
ccc933e97b5bb2c4f98923d77845cf102c4ee3ab 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> Use repeatable timestamps

This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
/build/make/core/version_defaults.mk
8e29bba8c3f05adca97b80664a552378f4525464 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> am ec5e3aae: resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp

* commit 'ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188':
Revert "Use repeatable timestamps"
a635da13b297fa8b9da0858f23ebfaf98afa01d0 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> am a3b91e62: resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp

* commit 'a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17':
Use repeatable timestamps
ec5e3aae6d8c89a5f6ca0a34fcdfc72e9a611188 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> resolved conflicts for merge of b184ec2a to mnc-dr-dev-plus-aosp

Change-Id: I90ac0f467ff13a038f27581cb2d07b1c5af5bd92
a3b91e621c4ca1708fa2572e05e8ac5b0f4b5d17 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> resolved conflicts for merge of c576c08f to mnc-dr-dev-plus-aosp

Change-Id: I86f6d0e7b9def5afa618915e7249c6758a5f0d1b
92026f2d366bc33ee974b0e74af071a894642d0c 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> Revert "Use repeatable timestamps"

OSX `date` doesn't understand -d

This reverts commit 13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa.

Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
/build/make/core/version_defaults.mk
13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa 12-Aug-2015 Dan Willemsen <dwillemsen@google.com> Use repeatable timestamps

This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.

It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.

Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
/build/make/core/version_defaults.mk
e3ef4962450e89db3ea7cb4ad794537bbaa8a1f2 11-Aug-2015 Ian Pedowitz <ijpedowitz@google.com> am 7ec5d8a4: am dfb29da8: am c396ce62: am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0

* commit '7ec5d8a457305c020ed9f0dc15797019c2358714':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
a18c5028d77f0323b8b8959982ae7d6b1ec7aded 11-Aug-2015 Ian Pedowitz <ijpedowitz@google.com> Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0

Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
/build/make/core/version_defaults.mk
5f058af042c8938e71f291c2cf4ff3f544142c0b 11-Aug-2015 Ian Pedowitz <ijpedowitz@google.com> am af87dadd: am a5541820: am 817a2d2b: am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4

* commit 'af87dadd0ca161dc8ddf5e1edc017a8847c6b85c':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
38ffb0cf899d94cb72409519bd25dc94048dd719 11-Aug-2015 Ian Pedowitz <ijpedowitz@google.com> Bump PLATFORM_PREVIEW_SDK_VERSION to 4

Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
/build/make/core/version_defaults.mk
56866c4d0e31bbc65e333754bb69accb2b0f4a36 31-Jul-2015 Dianne Hackborn <hackbod@google.com> Merge "Remove M codename, version number is 6.0." into mnc-dev
6b28b75e79a12ccd5402404a99392b3122c9cd14 30-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> am d1597242: am 2770497a: am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev

* commit 'd1597242c80ff6e45f33afd564681807c491e05b':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
307631b057d4e4c0975c006fd4c7e94aa39138a0 29-Jul-2015 Dianne Hackborn <hackbod@google.com> Remove M codename, version number is 6.0.

Change-Id: I27b477f087b135232f14157123d31da04dee04d7
/build/make/core/version_defaults.mk
db042bdccd0887af6137dba273cda7dd605718fb 29-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Bump PLATFORM_PREVIEW_SDK_VERSION to 3

Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
/build/make/core/version_defaults.mk
543aeac3fab7e264fdd41c45476500b172f65dbe 27-Jun-2015 Dianne Hackborn <hackbod@google.com> am c3db771c: am 578a9efd: Merge "Raise API level to 23." into mnc-dev

* commit 'c3db771cac9a2d448f4f624ac410377c30fc6158':
Raise API level to 23.
a42551685f61310fe336668df9c6e82ace3d9f17 27-Jun-2015 Dianne Hackborn <hackbod@google.com> Raise API level to 23.

Now apps can target both MNC and 23.

Change-Id: Ife6a844dc1a12b5d37973cbb890434c950dab7aa
/build/make/core/version_defaults.mk
1c21ab5265b10735e814ec917b2825c067d3977f 24-Jun-2015 Adam Powell <adamp@google.com> am f874dbb0: am 30638322: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 2" into mnc-dev

* commit 'f874dbb012d25b93a73e9058b9da1a2509766345':
Bump PLATFORM_PREVIEW_SDK_VERSION to 2
0cf80f3ab817e7d9ee2a5c2516b1a507711fab3c 24-Jun-2015 Adam Powell <adamp@google.com> Bump PLATFORM_PREVIEW_SDK_VERSION to 2

Change-Id: I6633e0077a6a89ef737d7c4b686aab033d94c41b
/build/make/core/version_defaults.mk
1824cebe955e57cd23151349292010d8adddf1ac 22-May-2015 Adam Powell <adamp@google.com> am 6a7ff54f: am 0d007cf6: Merge "Initialize ro.build.version.preview_sdk" into mnc-dev

* commit '6a7ff54f4320d190978f96c4d1155bfc2c103443':
Initialize ro.build.version.preview_sdk
bdd5e8e7fe6afb14c9b3028fdaa094008ada309c 21-May-2015 Adam Powell <adamp@google.com> Initialize ro.build.version.preview_sdk

Set the initial (version 1!) value for the preview SDK version
readable by apps. If we're on a release version, force it to be 0.

Change-Id: Ib3e6cad1f59cea8e4a781827d4a35dd3620b90f1
/build/make/core/version_defaults.mk
dbd37efcaed8e34143c6cca98189016ac40ff0c8 19-May-2015 Tim Kilbourn <tkilbourn@google.com> Add MNC as a valid codename in master.

Change-Id: I76e84fd75e16a75fcec61f5a738164fce5a86627
/build/make/core/version_defaults.mk
80cbcc48d3b12d9f3501a0d0a7b24f0d0edbc6ee 15-May-2015 Bart Sears <bsears@google.com> Master has moved on

Change master so it no longer thinks it is building MNC.

Change-Id: I0b68e78d02b7ceadbef0ca95fc74d20d31076881
/build/make/core/version_defaults.mk
0ed694f3261411fb6f028539aabedfba87580c1f 13-May-2015 Bart Sears <bsears@google.com> DO NOT MERGE - Change PLATFORM_VERSION from MNC to M

Goodbye to the cookie...

Change-Id: I0474115250411ccdfbdc769c6a464f9dbc460e8f
/build/make/core/version_defaults.mk
1c3bf5c39d281be4b437bc1a367c49b72c6e10b9 26-Mar-2015 Bart Sears <bsears@google.com> DO NOT MERGE - Bump version to 5.1.1

Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
/build/make/core/version_defaults.mk
2fc439c67a1ad8f16177ef2d916aee7773edd7f2 20-Feb-2015 The Android Open Source Project <initial-contribution@android.com> Restore AOSP-style version numbers - DO NOT MERGE

Change-Id: I2c81a4dacc13e4705388c3d359410c81999d7b95
/build/make/core/version_defaults.mk
c421abfcd549d45bd42f54afa5ec84be0379c8cf 22-Jan-2015 Dianne Hackborn <hackbod@google.com> Update version to MNC.

Change-Id: I67a69efa90babcfbc3e83907e46be0833c0ddcdd
/build/make/core/version_defaults.mk
592c24d865bdac1d619ddda4d92a92f7c404b11f 11-Dec-2014 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Bump version to 5.0.2.

Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
/build/make/core/version_defaults.mk
0421d0b115208b50015781b09f3661b65d72e858 04-Dec-2014 Dianne Hackborn <hackbod@google.com> Fix issue #18368417: 5.0 -> 5.1.

Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
/build/make/core/version_defaults.mk
5e923c91b42f1df7ec3da97b1506dd9aa93795d0 18-Nov-2014 Dave Langemak <dlangemak@google.com> Increment Android versions to 5.0.1

Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74
/build/make/core/version_defaults.mk
4a6a7524b398cabe144ccb02372ce8420c1b9780 17-Oct-2014 Dianne Hackborn <hackbod@google.com> Move up to API 21, Lollipop MR1.

Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
/build/make/core/version_defaults.mk
cef526f0f48340256a79999cb2ddbc1c86933141 01-Oct-2014 Justin Koh <justinkoh@google.com> DO NOT MERGE Update version code for MR1 (4.4W.2)

Change-Id: Ib87f27166f773d8e880e7ffcded8e8b739989b7c
/build/make/core/version_defaults.mk
105df2f1d2882f6c49f0619c7c46b05d52a2e07a 23-Sep-2014 Dianne Hackborn <hackbod@google.com> And then L, without ever becoming a real code name, transforms like magic to 5.0.

The code name looked at 5.0 despondently. "Won't anyone care about
me? Why does everyone pretend like I don't even exist!" And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.

But 5.0 knew better. "L," the number said, "don't you fear. Some
day, I am sure, your name will go up in lights. Your name will shine
brighter than even my own. And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."

L could only hope this would be true. But not today. Today, L
is still nobody.

Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
/build/make/core/version_defaults.mk
bf9b9275afee56f5ba3cda504fe97a36945577e0 26-Aug-2014 Dianne Hackborn <hackbod@google.com> Shhhhhhh!!!

Change-Id: I3bb72742f788c70f82f311b6ffba479aa02a1eb0
/build/make/core/version_defaults.mk
e2ff12bf2a6892ec56676b6a845a02e81b372e8c 12-Aug-2014 Justin Koh <justinkoh@google.com> DO NOT MERGE Bump version string.

Bump version string for KKWT MR0
Bug: 16982332

Change-Id: I8636169362ec45891257c39fb47574a6e021a3f0
/build/make/core/version_defaults.mk
997b896eeb49b5aca9807a58ae39b14436ab6e98 11-Jun-2014 Dianne Hackborn <hackbod@google.com> Update to reflect KKWT's graduation to API 20.

Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
/build/make/core/version_defaults.mk
3b118a55b94d96f8ac1e1f903d17ed650ccd0355 06-Jun-2014 Bart Sears <bsears@google.com> MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE

Make is so.

Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
/build/make/core/version_defaults.mk
f6c21e726282d2991515b94d8c36159b67e45d43 22-Apr-2014 Justin Koh <justinkoh@google.com> Set API version for KKWT. DO NOT MERGE

Set API level and version string for KKWT.

Change-Id: I18178e9286e6115f4f7273d4489dd91b3205e5cf
/build/make/core/version_defaults.mk
6ee3c4327d706c6bb0c0875f3094ab43bf96a7fd 25-Apr-2014 Dianne Hackborn <hackbod@google.com> Add new facility to have multiple active codenames.

Use this to have both L and KKWT.

Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
/build/make/core/version_defaults.mk
7503e736ebb0161a23ff0ee39a307cd436ea8afc 11-Mar-2014 Dianne Hackborn <hackbod@google.com> 4.4.3 is MR2, version boogaloo!

Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
/build/make/core/version_defaults.mk
56dab1861715bc570e40834d8b7586b9eabf06e1 05-Mar-2014 Dianne Hackborn <hackbod@google.com> It's L, dagnabbit.

Change-Id: Ied4e6fce1464aa5cd012a5e2519df8462ec91b4c
/build/make/core/version_defaults.mk
fc021daaca11917888ed941ee0ea1877965d437b 10-Feb-2014 Dianne Hackborn <hackbod@google.com> Fix issue #12939338: Android version showing as 'KKWT'

Thou shalt be... L!

Change-Id: I53e66eaf64183fbab0b1035cdb376b25abab4879
/build/make/core/version_defaults.mk
303d275591a4a73ac0a6ca49f4396f6a0d994095 04-Feb-2014 Justin Koh <justinkoh@google.com> Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.

Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
/build/make/core/version_defaults.mk
63ac27537893533eb067f9f2b51e44f82f908703 04-Dec-2013 Dave Langemak <dlangemak@google.com> .1 becomes .2

Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
/build/make/core/version_defaults.mk
b6ab1203fb94490faa29357fcfea9bd0da7ba7ac 14-Nov-2013 Dianne Hackborn <hackbod@google.com> Just a little .1 makes all the difference in the world.

Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
/build/make/core/version_defaults.mk
6a4d33390769d80113f16d383506dc9238e1d5fc 03-Oct-2013 Dianne Hackborn <hackbod@google.com> So long Key Lime Pie, it was nice knowing you.

Now we are KitKat.

I mean Android 4.4 API 19.

Or whatever.

Bug: 10348975

Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
/build/make/core/version_defaults.mk
6198be83d8c882dbd05343d57d516e15974cddcc 30-Apr-2013 Dianne Hackborn <hackbod@google.com> Bump up to API 18 to match jbmr2.

Change-Id: I84755411b6688edc373a8fbd44af0dbc8e89d2ac
/build/make/core/version_defaults.mk
a6e7f284923d597a93c04790774360c1ad4f64e1 05-Mar-2013 Dianne Hackborn <hackbod@google.com> Welcome, Key Lime Pie.

Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
/build/make/core/version_defaults.mk
aa8c2956c2014984f7fed3a4c911934a2161b2b2 02-Feb-2013 Dianne Hackborn <hackbod@google.com> You would not believe how much we all love jelly beans.

Seriously.

We looooooove them.

Especially Ryan.

Change-Id: I7ef04f1113147cb86a660c566b0d95d8c55eafd4
/build/make/core/version_defaults.mk
cced518b1e09734c90f2fbe5cb0bf85ae9c5fccc 12-Dec-2012 Nick Kralevich <nnk@google.com> It's a new version!

Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
/build/make/core/version_defaults.mk
fb28a3a4e51542e7f52b98cb5f69522181b8b8ed 04-Dec-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 0f4e3718 to master

Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
0f4e3718dff489f25ff5d6a1431a37a18bef52f4 03-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge d2e4c25e

Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
aa48e74b60eb56b25d525b0c52f7f51a68404e15 01-Dec-2012 Dianne Hackborn <hackbod@google.com> Obviously JB MR1.1 should be Android 4.2.2.

Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
/build/make/core/version_defaults.mk
136383549fb554d91938ddf352cc713abfac9d73 20-Nov-2012 Jean-Baptiste Queru <jbq@google.com> Merge f7306051c160edc22cf32da09eca310ff0e18177

Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
efcc8b1c79011a6d8ea13774da84c8892cb27e27 19-Nov-2012 Ed Heyl <edheyl@google.com> bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
/build/make/core/version_defaults.mk
dde4fc127c3c18531a1da9d3c72d1467979b413a 09-Nov-2012 Jean-Baptiste Queru <jbq@google.com> Version number for AOSP master - do not merge

Change-Id: I67dab0de027ab458de326375a3f8077594f702cb
/build/make/core/version_defaults.mk
0bc03946889f04b333ec46ee4695a987ad7b4c0f 28-Sep-2012 Dianne Hackborn <hackbod@google.com> Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!

Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
/build/make/core/version_defaults.mk
1196c82491e29eed257a44aa7384d8b836657b82 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"

* commit '7159a992ddcda51c91843a29cd1aa30815bc8370':
Set the AOSP master to be API level 16
e46e8603b2026a35b0bee8ca57a3a2737bd18c1f 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Set the AOSP master to be API level 16

Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
/build/make/core/version_defaults.mk
75f4c7232026335722ba90d486e2d27044a7a4e7 31-Jul-2012 Dianne Hackborn <hackbod@google.com> This branch is now JB MR1 development.

Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
/build/make/core/version_defaults.mk
3742983d3becfa141557d9f5b461c8d39e9d31c0 10-May-2012 Dianne Hackborn <hackbod@google.com> JellyBean is now 4.1.

Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
/build/make/core/version_defaults.mk
48cf73bd13e3693e6e4f92dce98f3b94a4c9760d 01-May-2012 Jean-Baptiste Queru <jbq@google.com> Restore AOSP-style version numbers - do not merge

Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
/build/make/core/version_defaults.mk
512ce9cb42ac9c20692bdf16a51d921a6fe504be 25-Jan-2012 Dianne Hackborn <hackbod@google.com> You know back when I said this thing about Ice Cream Sandwich MR2?

What was I thinking?

That would be *ridiculous*.

What sane person would come up with a release like that?!?

I mean... four words! Six if you try to say it! Insane!!

Instead, we shall call you:

Jelly Bean.

Yum.

Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
/build/make/core/version_defaults.mk
6e4e1bbbc1f3e3c8e53940ffec24da9d1be4ff25 11-Nov-2011 Dianne Hackborn <hackbod@google.com> Dev branch for ICS MR2.

Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
/build/make/core/version_defaults.mk
b32faad390eb8a865b0ea2b18fdfa9b87c4ff689 02-Nov-2011 Dianne Hackborn <hackbod@google.com> MR1 is version 4.1, API 15.

Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
/build/make/core/version_defaults.mk
7766ea28843bb3cb223c65b1752055288ad245d8 22-Sep-2011 Dianne Hackborn <hackbod@google.com> Let's call MR0 4.0.1.

Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
/build/make/core/version_defaults.mk
4d7ddab160ba29247225e11c2092dcfd68bd6baf 14-Sep-2011 Dianne Hackborn <hackbod@google.com> Hello, Android 4.0.

Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
/build/make/core/version_defaults.mk
8edd7f9a35276ca3e2c284e8b637fce3b7156b32 10-Jun-2011 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 3f72af13 to master

Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
3f72af13706bc6715f692b8e4879dbb50f818881 10-Jun-2011 Dianne Hackborn <hackbod@google.com> Merge cb5b6d16

Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
0b22d93be32eeff06e6626ad766b040057b931a5 09-Jun-2011 Dianne Hackborn <hackbod@google.com> Welcome, Android 3.2.

Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
/build/make/core/version_defaults.mk
cdef404572a71ea320f59643c52143764bd590fe 19-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge 5d66a07d - do not merge

Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
174c15d067a54ad056d4cc368f790b89fc71dfe9 10-May-2011 Jean-Baptiste Queru <jbq@google.com> Use actual numbers in version numbers.

This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.

Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
/build/make/core/version_defaults.mk
22b5d62172f1563a2513dea314c037703cddf217 10-May-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. We are now dev branch for Honeycomb MR2.

Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
/build/make/core/version_defaults.mk
e4b2178329801789c0f20a97d5fde06e9da11d70 22-Mar-2011 Dianne Hackborn <hackbod@google.com> Onward and upward! And ice cream for all!

Change-Id: If4f5541e1bac283f4c2f43d6e73e37c124ba7684
/build/make/core/version_defaults.mk
59daa2bc61ff0992f792a50dd413dcedd6359cf4 10-Mar-2011 Dianne Hackborn <hackbod@google.com> It's a new version!

Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
/build/make/core/version_defaults.mk
97f3f086224cc9bd804aa4c01d923f833d14f81c 24-Jan-2011 The Android Automerger <android-build@android.com> resolved conflicts for merge of b5952289 to master

Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
b5952289e2dd0d84671881422a60df305193e964 24-Jan-2011 The Android Automerger <android-build@android.com> resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp

Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
733ce0d0cc0431d254eea11a044210dc24b11e08 23-Jan-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Hello, Android 3.0 API 11.

Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
/build/make/core/version_defaults.mk
fce88928fef25777a0e409e2ed6e19fe0da0b8c6 21-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge

This reverts commit 7e1ce27c08ec57032520613488ec2fe5b3795126, reversing
changes made to 7dfc1270967c96be6dcd58fb7770c07482a7e90d.

Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
/build/make/core/version_defaults.mk
7e1ce27c08ec57032520613488ec2fe5b3795126 21-Jan-2011 Ed Heyl <edheyl@google.com> Merge commit '50738779' into gingerbread-plus-aosp

Conflicts:
core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
50738779d90970a3e36fe40a78df724946f323db 20-Jan-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE Fix issue #3373438: Update GBMR versions

Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
/build/make/core/version_defaults.mk
68404ba40ef52b7c5da5425fd51f99ae3434bfa0 16-Jan-2011 Dianne Hackborn <hackbod@google.com> Bump API version up to 10, thus resource version up to 11.

Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
/build/make/core/version_defaults.mk
7e41e31038402395541a7323b1ba75faf91817c7 06-Jan-2011 Dianne Hackborn <hackbod@google.com> We. Are. Honeycomb!

Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
/build/make/core/version_defaults.mk
3463d0e1026263d9d740c3324138a346b0c9006d 15-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
c1b330818e06cf5a3dc8d342e941eba5bce0929a 14-Dec-2010 Dianne Hackborn <hackbod@google.com> (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"

We are now version 2.4, API 10.

Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
/build/make/core/version_defaults.mk
0c3d5d9541fd254963355af83e47ad0696115adb 09-Dec-2010 android-merger <android-merger@google.com> 2.3.1

Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
/build/make/core/version_defaults.mk
311c267e150203543fe8eab41e0dceef88c331de 21-Oct-2010 Dianne Hackborn <hackbod@google.com> We are API 9 compatible.

Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
/build/make/core/version_defaults.mk
8cd383837143a9140605301898c87d5c0817b308 18-Oct-2010 Dianne Hackborn <hackbod@google.com> Gingerbread becomes real.

Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
/build/make/core/version_defaults.mk
79b4be961b3f1d099033e37d2185c245d80210fc 25-Jul-2010 Dianne Hackborn <hackbod@google.com> Change version codename.

Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
/build/make/core/version_defaults.mk
833e62400e7ecfea3df188b99b6639708fe36963 28-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Update platform version strings for AOSP

Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
/build/make/core/version_defaults.mk
f03c9acfecaa809ea86527d1edcb94f5633e7372 11-Jun-2010 Ed Heyl <edheyl@google.com> fix platform name

Change-Id: Ic6507f94887ead4d710a3da85582d49a2d9b8f24
/build/make/core/version_defaults.mk
1d2c25b7804e6fcee213b5ed81594f48c563e2eb 11-Jun-2010 Ed Heyl <edheyl@google.com> kraken --> gingerbread

Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
/build/make/core/version_defaults.mk
d6f9929f4a51e3da687c0b03553661c09f0eb224 16-Apr-2010 Dianne Hackborn <hackbod@google.com> Mmmmmm... Gingerbread!

Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
/build/make/core/version_defaults.mk
cc45ee9c3c68f72391f5e7ba300312047d976bfa 15-Apr-2010 Dianne Hackborn <hackbod@google.com> On to Kraken...

Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
/build/make/core/version_defaults.mk
efba0b9829ae375a7d7e2093dee707b79f1b8951 05-Apr-2010 Dianne Hackborn <hackbod@google.com> It's beginning to look a lot like release time!

Everywhere we build...

Froyo is now Android 2.2, API 8.

This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?

Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
/build/make/core/version_defaults.mk
aa2885ed34c3949d2008d8c976e8645f3eeee56d 17-Dec-2009 Jeff Hamilton <jham@android.com> Switch the platform name from Eclair-MR2 to Froyo.
/build/make/core/version_defaults.mk
176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc 04-Dec-2009 Dianne Hackborn <hackbod@google.com> Change version to MR2 development.
/build/make/core/version_defaults.mk
c3e17966b597f50e056eac42016e054f1d837eaf 19-Nov-2009 Dianne Hackborn <hackbod@google.com> Update version name to 2.1 and API to 7.

Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
/build/make/core/version_defaults.mk
f6295cdd8234673965ee41015e32340d4e8a76a7 13-Nov-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2258571: Fix build versions

Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
/build/make/core/version_defaults.mk
3fa115999c8512095301724f557821f25ddfe08f 23-Oct-2009 Dianne Hackborn <hackbod@google.com> Bump version to 2.1 API 6.

Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
/build/make/core/version_defaults.mk
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9 09-Oct-2009 Dianne Hackborn <hackbod@google.com> Finish issue #2168428: STOP SHIP: Bump API version to 5.

We are now 2.0. Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
/build/make/core/version_defaults.mk
0187d84264fb6cf67650354c8c5da0a0712dbb0b 07-Oct-2009 Dianne Hackborn <hackbod@google.com> Part of issue #2168428: STOP SHIP: Bump API version to 5

This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.

Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
/build/make/core/version_defaults.mk
e34fdc0113477e2022bda8834b37338c57884f48 19-Aug-2009 Dianne Hackborn <hackbod@google.com> Bump platform version to 4.

Not sure why this didn't get integrated from Donut.
/build/make/core/version_defaults.mk
678ea423074d58fa421529d4ce5f7f3aabf620aa 18-May-2009 The Android Open Source Project <initial-contribution@android.com> merge 9bd5404a9d30b82ba3d2750c0cb8cae88b33f82d w/conflict
9bd5404a9d30b82ba3d2750c0cb8cae88b33f82d 16-May-2009 Dianne Hackborn <hackbod@google.com> Use new aapt feature to add default version info to .apks.
/build/make/core/version_defaults.mk
ab1e594c5d5cf65db54ad3c19d0abc1a99d4071e 13-May-2009 Dianne Hackborn <hackbod@google.com> Update build version to Eclair.
/build/make/core/version_defaults.mk
9537884b0dabe81bf612c79d12c7b4bf40de10a5 08-May-2009 Dianne Hackborn <hackbod@google.com> Add new property for dev codename, update version to Donut.
/build/make/core/version_defaults.mk
7b64124f0baabfa7216727a03e23fa1330fc6fad 25-Mar-2009 Sriram Raman <> Automated import from //branches/donutburger/...@142410,142410
/build/make/core/version_defaults.mk
88b607994a148f4af5bffee163e39ce8296750c6 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/build/make/core/version_defaults.mk
05806d7af62e07c6225b2e7103a1b115ecf6c9ad 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/build/make/core/version_defaults.mk
475fa12adef8fc2b08290555a33dc8a9fef05be4 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
/build/make/core/version_defaults.mk
dcc08f073b6873c69ab891d4f69f7c568e282df7 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/build/make/core/version_defaults.mk
b6c1cf6de79035f58b512f4400db458c8401379a 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/build/make/core/version_defaults.mk