am aee2ef0a
: am 350ea07c
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'aee2ef0a848d8008eda92a0f1fbdcb65af0490ce': Import translations. DO NOT MERGE
This commit is contained in: