am 6a66b5c8: am a4035aef: Merge "Use the correct resource id for Battery use shortcut title." into honeycomb

* commit '6a66b5c861bc3fcf8af2c8592c071d52809998d0':
  Use the correct resource id for Battery use shortcut title.
This commit is contained in:
Amith Yamasani
2011-01-27 15:16:43 -08:00
committed by Android Git Automerger

View File

@@ -1016,7 +1016,7 @@
<activity android:name="Settings$PowerUsageSummaryActivity"
android:theme="@android:style/Theme.Holo"
android:label="@string/storage_settings_title">
android:label="@string/power_usage_summary_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />