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