am f5e9cca7
: (-s ours) am 94c4b78a
: am ecfe5f0d
: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'f5e9cca7a07e9a9824ed93ade0ffffb5cf97590e': Import translations. DO NOT MERGE
This commit is contained in: