tree a405fb465d0783ab49d82a6f823938bf971ea109
parent e222a9162922ccc1ee8db5db5ca999d222e4d50c
parent e480bebb2b40a552183d9af9d3a02cdfa47fdd62
author Geoff Mendal <mendal@google.com> 1418051966 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418051966 +0000

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