am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290...
am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '60238734':
Another stab at fixing issue #3149290 java.lang.RuntimeException:...