Merge branch 'master' into dev_680_礼物展馆

# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle

lib_huawei/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply from: "../package_config.gradle"
 
 android {
+    namespace "com.yunbao.huawei"
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {

lib_huawei/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shayu.lib_huawei">
+   >
 
 </manifest>