OSDN Git Service

Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328...
authorSelim Cinek <cinek@google.com>
Fri, 14 Oct 2016 14:28:12 +0000 (14:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 14:28:12 +0000 (14:28 +0000)
am: 8bd7df4536

Change-Id: I89a5d36d40cd1b1973f99406905bafc20ba1c8dc


Trivial merge