tree 4602f5a21c6918cf368e013d68bf3197f46a8bae
parent aa133acb9181e54d85718b3069a3e9c867f27816
parent 95e1865ef63e7958a40c0a67cac05a5748631eb2
author Treehugger Robot <treehugger-gerrit@google.com> 1476319542 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476319542 +0000

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