tree f9466ea7b3bdc409b0611b77f05e6a55b6a5ea1f
parent 824be94f31cfbb7f09bc3999bb44b084cff3ab45
parent e81650071c84436cd996f73d40ad074c43782a32
author Baligh Uddin <baligh@google.com> 1413650248 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413650248 +0000

am e8165007: (-s ours) am 1dd8d00b: (-s ours) am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit 'e81650071c84436cd996f73d40ad074c43782a32':
  Import translations. DO NOT MERGE