commit 26d17715ddf424bb6c1fdef4154a046a6b21c866
author Rohan Martin <rohan.martin@thisisant.com> Wed Dec 05 17:45:17 2012 -0700
committer Rohan Martin <rohan.martin@thisisant.com> Wed Dec 05 17:45:17 2012 -0700
tree ded8555b310c1e89f9bb0d4119e0c506cd5d91cb
parent bab3cf0bb3664df6bd8bc014938e64f02eb906bb

Pull in Android_System_ANTHALService_2-1-0

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c211eff..11dc7f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.dsi.ant.server"
-    android:versionName="2.0.1"
-    android:versionCode="020001"
+    android:versionName="2.1.0"
+    android:versionCode="020100"
     android:sharedUserId="android.uid.system">
 
     <uses-sdk

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c07c1c1..a1ad8b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,7 +17,7 @@
  limitations under the License.
 -->
 <resources>
-    <string name="app_name">ANT HAL Service - DSI BlueZ</string>
+    <string name="app_name">ANT HAL Service</string>
     
 <!-- Permissions -->
     <!-- Permission description for com.dsi.ant.permission.ANTRADIO -->