tree fbbf1af8b3273ee69e60750c87c447c0c013dd1e
parent 7409bac3ba86594acf1cea32bd93fd7801a04c2a
parent 0fdf05e909b3645983f434847ce652254006da7d
author Geoff Mendal <mendal@google.com> 1414435834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414435834 +0000

am 0fdf05e9: (-s ours) am 0dffb211: (-s ours) Import translations. DO NOT MERGE

* commit '0fdf05e909b3645983f434847ce652254006da7d':