From 8cf4db7e4ffa86670ce063791300b0feaf19082d Mon Sep 17 00:00:00 2001
From: huangdali <137722697@qq.com>
Date: Mon, 3 Jul 2017 10:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=90=8D=E7=A7=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libzxing/src/main/AndroidManifest.xml    | 2 +-
 libzxing/src/main/res/values/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libzxing/src/main/AndroidManifest.xml b/libzxing/src/main/AndroidManifest.xml
index 2d4c985..ada977c 100644
--- a/libzxing/src/main/AndroidManifest.xml
+++ b/libzxing/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
     <application
         android:allowBackup="true"
-        android:label="@string/lib_name"
+        android:label="@string/app_name"
         android:supportsRtl="true">
         <activity
             android:name=".activity.CaptureActivity"
diff --git a/libzxing/src/main/res/values/strings.xml b/libzxing/src/main/res/values/strings.xml
index 4b2b959..106d050 100644
--- a/libzxing/src/main/res/values/strings.xml
+++ b/libzxing/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="lib_name">libzxing</string>
+    <string name="app_name">libzxing</string>
     <string name="jwstr_scan_it">Scan it</string>
     <string name="jwstr_scan_text">Place the QR code into the box to start automatic scanning </string>
     <string name="jwstr_prompt">Prompt</string>