tree 122703526314e3ed4c2ba6f740ad0433dbd676bf
parent 53ccdf1894f64ea53e2dd57477c783c82b81e537
parent 15fdce9d65b47e2b92bcac78776cc01486cff61a
author Baligh Uddin <baligh@google.com> 1396621852 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396621852 +0000

am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '15fdce9d65b47e2b92bcac78776cc01486cff61a':
  Import translations. DO NOT MERGE