Android m preview 2
Merge "Fix tab/space inconsistencies in stk_msg_dialog.xml"