tree 02933f174031619d358b24727f96a1ed1afe8831
parent de2fb25862020a8ead20dfcb7a69d77830a05e99
parent 1b60879b4b2191f427627da234351616b84a69bd
author Treehugger Robot <treehugger-gerrit@google.com> 1476319558 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1476319558 +0000

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