Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp * commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307': Fix issue #3117472: Format storage dialog still broken
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp * commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307': Fix issue #3117472: Format storage dialog still broken