Commits
Eric Fischer authored and Android Git Automerger committed 4f6831c51d5M
am a7faeb0c: (-s ours) am 3fd57b57: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'a7faeb0c6b97c8a43339e45e3f37056c30e4c685': Import translations. DO NOT MERGE
Showing diff to8c898e1e437