From ddbf80568de00e24d22c0fce10e4c394cd9a072f Mon Sep 17 00:00:00 2001
From: Marcos Marado <mmarado@cyngn.com>
Date: Mon, 19 Oct 2015 13:45:32 +0100
Subject: [PATCH] Updated CHANGELOG and (c) date

Change-Id: I7fe1156e999cf543b5b3459d7746718a73845ccf
---
 CHANGELOG.mkdn | 20 ++++++++++++++++++++
 LICENSE        |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 13b31c94..8b329156 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -7,6 +7,26 @@ Visit http://review.cyanogenmod.org for our Gerrit instance.
 
 CHANGELOG (notable new features)
 ---------
+
+### 12.1 YOG4PAO3
+* Common: Android 5.1.1 (Google)
+* Android Security Bulletin – October 5th update
+
+### 12.1 YOG4PAO2
+* Common: Android 5.1.1 (Google)
+* New Devices: Andromax Q (rendang), Galaxy S5 China (kltechn), Galaxy S5 Duos (klteduos), Galaxy S5 Duos China (kltechnduo)
+* IMAP idle support
+* SDK v1 release
+* Stagefright security fixes
+
+### 12.0
+* Common: Android 5.0 (Google)
+
+### 11.0.0 M12
+* Common: Android 4.4.4 (Google)
+* patches against POODLE vulnerability in SSLv3
+* Multi-sim improvements throughout the OS experience
+
 ### 11.0.0 M11
 * Common: Android 4.4.4 (Google)
 * New Devices: Galaxy S4 Active (jactivelte), Galaxy S4 SK I-9506 (ks01lte), Galaxy S5 GSM (klte), Galaxy Tab 10.1 (picassowifi), Galaxy Player 4.0 (ypg1)
diff --git a/LICENSE b/LICENSE
index e1acbbb2..69f49a5e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-   Copyright 2011-12 The CyanogenMod Project
+   Copyright 2011-15 The CyanogenMod Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.