| commit | b5b33e363be2ed48bf793890a123127e6661c5f1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Oct 13 00:45:58 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 13 00:45:58 2016 +0000 |
| tree | 02933f174031619d358b24727f96a1ed1afe8831 | |
| parent | de2fb25862020a8ead20dfcb7a69d77830a05e99 [diff] | |
| parent | 1b60879b4b2191f427627da234351616b84a69bd [diff] |
Merge "DO NOT MERGE - Added translations for emergency action string" into lollipop-mr1-dev