Merge "Shorter option for alarm "Silence after"" into lmp-mr1-dev

    <!-- Entries listed in the ListPreference when invoking the auto silence

    <!-- Entries listed in the ListPreference when invoking the auto silence

         preference. -->

         preference. -->

    <string-array name="auto_silence_entries">

    <string-array name="auto_silence_entries">

      <item>1 minute</item>

      <item>5 minutes</item>

      <item>5 minutes</item>

      <item>10 minutes</item>

      <item>10 minutes</item>

      <item>15 minutes</item>

      <item>15 minutes</item>

      <item>20 minutes</item>

      <item>20 minutes</item>

      <item>25 minutes</item>

      <item>25 minutes</item>

      <item>30 minutes</item>

      <item>Never</item>

      <item>Never</item>

      </string-array>

      </string-array>

    <!-- Values that are retrieved from the ListPreference. These must match

    <!-- Values that are retrieved from the ListPreference. These must match

         the auto_silence_entries above. -->

         the auto_silence_entries above. -->

    <string-array name="auto_silence_values" translatable="false">

    <string-array name="auto_silence_values" translatable="false">

      <item>1</item>

      <item>5</item>

      <item>5</item>

      <item>10</item>

      <item>10</item>

      <item>15</item>

      <item>15</item>

      <item>20</item>

      <item>20</item>

      <item>25</item>

      <item>25</item>

      <item>30</item>

      <item>-1</item> <!-- Off -->

      <item>-1</item> <!-- Off -->

      </string-array>

      </string-array>