tree bc2f55d515f28a12564be11df8e8a114e3a18792
parent 31ee1dab23c3cb15b7bd90d863b328c963f9a29b
parent dc4756c90d77316469d8cb9f5e6122667359485f
author Geoff Mendal <mendal@google.com> 1400084755 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400084755 +0000

am a5ad62fa: (-s ours) am b6441923: (-s ours) Import translations. DO NOT MERGE

* commit 'a5ad62fa780f8087444c08d42f200bc7ddd3d47b':