am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472: Format storage dialog...
am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread
Merge commit '2f1eee34'
* commit '2f1eee34':
Fix issue #3117472: Format storage dialog still broken