am 013987c7
: (-s ours) am 0c31e078
: am e00f034e
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '013987c717291f948f074c05da02bfcfb2a14cec': Import translations. DO NOT MERGE
This commit is contained in: