reconcile with open-source gingerbread
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ca3e5b..b0866da 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -143,7 +143,9 @@
</intent-filter>
</activity>
- <activity android:name=".wifi.WifiApSettings">
+ <activity android:name=".wifi.WifiApSettings"
+ android:configChanges="orientation|keyboardHidden"
+ >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d88f497..ddaf5dc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -800,7 +800,7 @@
<string name="service_started_by_app" msgid="6575184738671598131">"애플리케이션에서 시작했습니다."</string>
<!-- no translation found for service_client_name (4037193625611815517) -->
<skip />
- <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> 무료"</string>
+ <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> 남음"</string>
<string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> 사용됨"</string>
<string name="memory" msgid="6609961111091483458">"RAM"</string>
<!-- no translation found for service_process_name (4098932168654826656) -->