| commit | c01d969abf928e8c7f62d6b01de18f9f5f21de3a | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Oct 14 14:28:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 14 14:28:12 2016 +0000 |
| tree | 7bff47573eb73594c75cd77f4b9047e6cf9d2166 | |
| parent | c8c013f88dae0c28ff845d7414a2f2d9343d85f4 [diff] | |
| parent | 8bd7df4536c91320d19a2508d184cb74c50f4f05 [diff] |
Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328 -s ours am: cb654a5fbd -s ours am: 8bd7df4536 Change-Id: I89a5d36d40cd1b1973f99406905bafc20ba1c8dc