tree fbf8358dddf402a34f21e0ba02559ebd46c7e4d5
parent e35b3e380f42f450ce0116b8ef83edb7d68584ef
parent c6c9079a61d873f116a2353a42e07c4241ef9b12
author Geoff Mendal <mendal@google.com> 1426510179 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426510180 +0000

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