Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328 -s ours
am: cb654a5fbd -s ours
Change-Id: I54c256a00fa10c6eaffc6acb4108e81144ec2722
This commit is contained in: