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

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

* commit '6317598a196ada3f32950c7f4a8d5cfe005acf42':
  Import translations. DO NOT MERGE