am b7dda6d3: am b94a7fb3: Merge "Fix ConcurrentModificationException in...
am b7dda6d3: am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit 'b7dda6d3':
Fix ConcurrentModificationException in TextServicesManagerService