Merge "changes related to moving the trust agent setting s in thne security menu"

        <!-- Component name of an activity that allows the user to modify

             the settings for this trust agent. -->

        <attr name="settingsActivity" />

        <!-- Title for a preference that allows that user to launch the

             activity to modify trust agent settings. -->

        <attr name="title" />

        <!-- Summary for the same preference as the title. -->

        <attr name="summary" />

    </declare-styleable>

    <!-- =============================== -->