resolved conflicts for merge of d90712d0 to master

<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<!-- These resources are around just to allow their values to be customized

     for watch products.  Do not translate. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Only show power and settings items due to smaller real estate. -->

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

        <item>power</item>

        <item>settings</item>

    </string-array>

</resources>

 No newline at end of file