tree f665b3da1b8f77acaabc4739c8cc5e15aa117402
parent 8b3e4ade3615a2e8ffa9fe331ee6601de2d54e1a
parent 716f176d3d8923ea09ef0784fd6349b2323f2d97
author Geoff Mendal <mendal@google.com> 1415829913 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415829913 +0000

Merge "Import translations. DO NOT MERGE"