tree c560330f63f0d44302791c6c42268f18c5732def
parent 56cfcbdd0b0adb33c7ab325022ce8d3698059b60
parent e984bbe47e0b246b2e255b829a7d07e704c966b3
author Geoff Mendal <mendal@google.com> 1440672954 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672954 +0000

am e984bbe4: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE

* commit 'e984bbe47e0b246b2e255b829a7d07e704c966b3':