Merge "Use a regular drawable as PowerSummaryActivity icon"

        <activity

            android:name="Settings$PowerUsageSummaryActivity"

            android:label="@string/power_usage_summary_title"

            android:icon="@drawable/ic_homepage_battery"

            android:icon="@drawable/ic_settings_battery"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />