commit dba64281d9114b97fd14f7f69dfc3ba515aadf53
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:35:11 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:35:11 2015 -0800
tree cd2d2ad664fb8ba7ba20f8af77a7d7e1ff854548
parent acaf0ecb840b996d2bbafee09759507bc196414f
parent f036f26225f774f2ae67070721ec5b043e34b512

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

Change-Id: I0e44a0bb8e352f2d37d1ee9d12157dfb1adb42df

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fa3e792..49c90c1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,6 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.fmradio"
+    android:sharedUserId="android.uid.system"
     android:versionCode="2"
     android:versionName="2.0" >
 

jni/fmr/Android.mk

diff --git a/jni/fmr/Android.mk b/jni/fmr/Android.mk
index 1700b4e..e1da5fb 100644
--- a/jni/fmr/Android.mk
+++ b/jni/fmr/Android.mk
@@ -31,5 +31,5 @@
     libmedia \
 
 LOCAL_MODULE := libfmjni
-include $(BUILD_SHARED_LIBRARY)
+#include $(BUILD_SHARED_LIBRARY)