diff options
| author | John Reck <jreck@google.com> | 2011-05-18 09:03:36 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-05-18 09:03:36 -0700 |
| commit | fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01 (patch) | |
| tree | fcab178478150890e8a7403ca0ab91e722b4851a /res/values | |
| parent | 9320ab5b395e2c47514e94dc4a8db7cb5dc8d66d (diff) | |
| parent | e619f1e55fe312b5b4ad451e56dd12f73ea66a49 (diff) | |
| download | packages_apps_Browser-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.zip packages_apps_Browser-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.tar.gz packages_apps_Browser-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.tar.bz2 | |
resolved conflicts for merge of e619f1e5 to master
Change-Id: I04de9e92a91cd66e848d37cbb07f7d36a4edba06
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/bools.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/res/values/bools.xml b/res/values/bools.xml new file mode 100644 index 0000000..6217de1 --- /dev/null +++ b/res/values/bools.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2011 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. +--> +<resources + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <bool name="isTablet">false</bool> +</resources> |