am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master...
am 15edaceb: (-s ours) am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '15edaceb'
* commit '15edaceb':
DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread