tree c028bfe537607823c37e2ffc8c713c73059d3130
parent dc15ca0c0c92d3ee56bf8471922cee72dcaa8be5
parent a6d27a5410c5052d8b91e250326a91755b6b4523
author Baligh Uddin <baligh@google.com> 1422685308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685308 +0000

am a6d27a54: (-s ours) am 8057d62d: (-s ours) am 132f44ca: (-s ours) am bdfc17ce: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'a6d27a5410c5052d8b91e250326a91755b6b4523':