| commit | df1b6d2f58a7de3c7d9bfd612cf9aeeea1f25990 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 13 00:45:36 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 13 00:45:36 2016 +0000 |
| tree | 3049a69990f50a13aebe52d9cce72f35e3142a8e | |
| parent | da89a248a1cf611c6d9aa92dc6bae5e83a6ab994 [diff] | |
| parent | 13f51c683e8aee26e2d70d06346edebde61b0737 [diff] |
Merge "DO NOT MERGE - Added translations for emergency action string" into marshmallow-dev