commit ef90dbc922a99522410056d728563920a6467006
author Bill Yi <byi@google.com> Wed Oct 24 14:47:31 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:47:31 2018 -0700
tree cc883d2a63667f110156421769ef71c7363cbf43
parent 7525835dc606501b19084c6fd09b2774317b60df
parent 2ae71a73e3e25ada33a18369e018ce7948535983

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Ie42bffba851af6d66aaac490a4743a0350416e2a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f79c324..ead7fa6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
         <service android:name="OpenWnnJAJP" android:label="Japanese IME"
 		 android:permission="android.permission.BIND_INPUT_METHOD"
-		 android:id="@+id/openwnn_japanese">
+		 android:id="@string/openwnn_japanese">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>