tree aeeba40eff7bfa7ab2ecf6595bf5a5723b47cae7
parent 7e7c91ec95eca5e1089ede9953f27d8c3d3b8bea
parent 5e5c39abdb18efb4b17204423b15c5434ad727b7
author Geoff Mendal <mendal@google.com> 1423782995 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423782997 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev