tree 3049a69990f50a13aebe52d9cce72f35e3142a8e
parent da89a248a1cf611c6d9aa92dc6bae5e83a6ab994
parent 13f51c683e8aee26e2d70d06346edebde61b0737
author Treehugger Robot <treehugger-gerrit@google.com> 1476319536 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476319536 +0000

Merge "DO NOT MERGE - Added translations for emergency action string" into marshmallow-dev