Merge "cm: Update properties and libs for stagefright-plugins" into lp5.1
diff --git a/config/common.mk b/config/common.mk
index 8ad10bb..0563f28 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -166,7 +166,7 @@
# SlimLP first version.
PRODUCT_VERSION_MAJOR = 5.1.1
PRODUCT_VERSION_MINOR = beta
-PRODUCT_VERSION_MAINTENANCE = 0.1
+PRODUCT_VERSION_MAINTENANCE = 0.2
ifdef SLIM_BUILD_EXTRA
SLIM_POSTFIX := -$(SLIM_BUILD_EXTRA)
endif
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index bd10939..ef75037 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -33,5 +33,14 @@
<string name="config_mms_user_agent">"Android-Mms/2.0"</string>
<string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
+ <!-- Automatic power profile management per app.
+ Each item should list the fully-qualified activity
+ name and the power profile id, separated by a comma. -->
+ <string-array name="config_auto_perf_activities" translatable="false">
+ <item>com.aurorasoftworks.quadrant.*BenchmarkExecutionActivity,2</item>
+ <item>com.antutu.ABenchMark.*,2</item>
+ <item>.*com.antutu.benchmark.*,2</item>
+ </string-array>
+
</resources>
diff --git a/slim.devices b/slim.devices
index 91c0fa6..49d8109 100644
--- a/slim.devices
+++ b/slim.devices
@@ -74,6 +74,7 @@
t0ltetmo
taoshan
tilapia
+titan
togari
toro
toroplus