commit ad410d91de8f32e02f824c40b58db638dcafc1b4
author The Android Automerger <android-build@google.com> Thu Jan 22 06:10:05 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 22 06:10:05 2015 -0800
tree 016c49a6d577cdfe83fe317bdf30274a43923199
parent 39070667cd21952d90e929a9c12f11cb9d4f2ab3
parent 4af27c85aa242b793d9d09ccf2ac793895363ff4

merge in lmp-mr1-release history after reset to lmp-mr1-dev

scriptc/rs_allocation.rsh

diff --git a/scriptc/rs_allocation.rsh b/scriptc/rs_allocation.rsh
index cdf64e8..03bd1ca 100644
--- a/scriptc/rs_allocation.rsh
+++ b/scriptc/rs_allocation.rsh
@@ -374,8 +374,7 @@
 
 #endif // (defined(RS_VERSION) && (RS_VERSION >= 18))
 
-// FIXME: this needs to be set to 22
-#if (defined(RS_VERSION) && (RS_VERSION >= 21))
+#if (defined(RS_VERSION) && (RS_VERSION >= 22))
 
 #define VOP(T)                                                                   \
     extern T __attribute__((overloadable))                                       \
@@ -424,8 +423,7 @@
 
 #undef VOP
 
-// FIXME
-#endif //(defined(RS_VERSION) && (RS_VERSION >= 21))
+#endif //(defined(RS_VERSION) && (RS_VERSION >= 22))
 
 
 #endif