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