tree 2432aee3e69979303ae430b6c6644588f826332b
parent ec748b86d7be1f8ff4a755754a1247645f841b7e
parent a1f02e1ad2c386666cac2018f30364eae08b5778
author Eric Fischer <enf@google.com> 1366738397 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366738397 -0700

am bfc6d1ec: (-s ours) am 8b56f108: (-s ours) am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translations. DO NOT MERGE

* commit 'bfc6d1ec88d0cf8de308380b3209a09b25deb98b':