diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-07-07 11:50:53 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-07-07 14:14:31 -0700 |
| commit | edb95090a0f4e14a27131f43afec5ad2bb43c1eb (patch) | |
| tree | ffd8edb4618579fcbae895c7adf331d1ae0f8279 | |
| parent | a68d79c1ef9ae6cb9dae6acfe7115ad47597376f (diff) | |
| parent | 20dde104397573039b43f7b03e85f60a53c0e575 (diff) | |
| download | build-edb95090a0f4e14a27131f43afec5ad2bb43c1eb.zip build-edb95090a0f4e14a27131f43afec5ad2bb43c1eb.tar.gz build-edb95090a0f4e14a27131f43afec5ad2bb43c1eb.tar.bz2 | |
Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEAD
Ticket: CYNGNOS-3020
Change-Id: I33a67fe76811b2bb8e9c1ae172326206a9f36b29
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index db41f98..07d978b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30M +export BUILD_ID=MOB30R diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e0c68cf..cb8ba51 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-06-01 + PLATFORM_SECURITY_PATCH := 2016-07-05 endif ifeq "" "$(PLATFORM_BASE_OS)" |