diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
| commit | 1a76449a643ab1e544da54514cf09f6f17f4d075 (patch) | |
| tree | 2615a977c52d7a479001ed451a58aa484dbe75e0 /photoviewer/sample/res/values-be/strings.xml | |
| parent | 9f1ab148925b098cec90d06992ade0fca2889a14 (diff) | |
| parent | e032f315b6f95896ff471e92a20a42159d53fa6a (diff) | |
| download | android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.gz android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.bz2 android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.zip | |
Merge branch 'goog/jb-ub-mail-ur8' into master
Conflicts:
photoviewer/AndroidManifest.xml
photoviewer/res/values/dimen.xml
photoviewer/src/com/android/ex/photo/Intents.java
photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
photoviewer/src/com/android/ex/photo/util/ImageUtils.java
photoviewer/src/com/android/ex/photo/views/PhotoView.java
Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
Diffstat (limited to 'photoviewer/sample/res/values-be/strings.xml')
| -rw-r--r-- | photoviewer/sample/res/values-be/strings.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/photoviewer/sample/res/values-be/strings.xml b/photoviewer/sample/res/values-be/strings.xml deleted file mode 100644 index d52e8ad..0000000 --- a/photoviewer/sample/res/values-be/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="559800164925277094">"PhotoViewerSample"</string> - <string name="menu_settings" msgid="1259682084875185697">"Налады"</string> - <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string> - <string name="launch" msgid="2345080120370773520">"Запусцiць Photo Viewer"</string> -</resources> |