OSDN Git Service

Merge "DO NOT MERGE - Added translations for emergency action string"
authorSelim Cinek <cinek@google.com>
Thu, 13 Oct 2016 01:00:24 +0000 (01:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 01:00:24 +0000 (01:00 +0000)
commitcb654a5fbd0e5cdc6b4fa7ce7e0dfca26ac40953
treee3fffb45d771216526aa4d0d7fb7a7390a4273d8
parent6f8c54a16de277e83332f586b6f2e32e12cbff9b
parentd33e79c328f368064bf64cecedbba9a21a7f6ad0
Merge "DO NOT MERGE - Added translations for emergency action string"
am: d33e79c328  -s ours

Change-Id: I3fe6f222f2c70a0b50147f5439c54d8553dda092