OSDN Git Service

Merge "DO NOT MERGE - Added translations for emergency action string" into nougat-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 13 Oct 2016 00:45:42 +0000 (00:45 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 13 Oct 2016 00:45:42 +0000 (00:45 +0000)

Trivial merge