Merge remote-tracking branch 'aospal/kitkat-staging' into kitkat-staging
Conflicts:
products/pa_deb.mk
products/pa_grouper.mk
products/pa_maguro.mk
products/pa_mako.mk
products/pa_manta.mk
products/pa_tilapia.mk
products/pa_toro.mk
products/pa_toroplus.mk
diff --git a/main.mk b/main.mk
index dbcbbab..81615da 100644
--- a/main.mk
+++ b/main.mk
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
-
include vendor/pa/vendor.mk
include vendor/pa/configs/aosp_fixes.mk
include vendor/pa/configs/system.mk
diff --git a/vendor.mk b/vendor.mk
index 131c1b8..7a210e4 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -5,4 +5,4 @@
ROM_VERSION_MAJOR := 4
ROM_VERSION_MINOR := 4
ROM_VERSION_MAINTENANCE :=
-ROM_VERSION_TAG := BETA1
+ROM_VERSION_TAG := RC1