Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of f7b79151 to master

Browse Source 
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
This commit is contained in:
Joe Onorato
2010-06-09 15:07:16 -07:00
parent 1d46191d88 f7b7915192
commit 8a5f10b30d
27 changed files with 231 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -26,7 +26,7 @@ import com.android.internal.view.IInputMethodManager;
import com.android.internal.view.IInputMethodSession;
import com.android.internal.view.InputBindResult;
import com.android.server.status.StatusBarManagerService;
import com.android.server.StatusBarManagerService;
import org.xmlpull.v1.XmlPullParserException;