Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG4Pstable/cm-12.1-YOG3C

Android 5.1.0 release 1

2 files changed, 1 insertions, 3 deletions

diff --git a/rs_version.mk b/rs_version.mk
index cbb70e9..909496a 100644
--- a/rs_version.mk
+++ b/rs_version.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-RS_VERSION := 21
+RS_VERSION := 22
 RS_VERSION_DEFINE := -DRS_VERSION=$(RS_VERSION)
 
 # Use RS_VERSION_DEFINE as part of your LOCAL_CFLAGS to have the proper value.
diff --git a/slang.cpp b/slang.cpp
index c3ab7e6..039b17a 100644
--- a/slang.cpp
+++ b/slang.cpp
@@ -452,8 +452,6 @@ int Slang::compile() {
 
   // The compilation ended, clear
   mBackend.reset();
-  mASTContext.reset();
-  mPP.reset();
   mOS.reset();
 
   return mDiagEngine->hasErrorOccurred() ? 1 : 0;