Commits
Geoff Mendal authored and Android Git Automerger committed 06e83b3d5acM
am d075d2f7: (-s ours) am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'd075d2f7594df21c94bae63bce4ed4d797baaef8': Import translations. DO NOT MERGE
Showing diff to228e2c26278