tree f1dfa41f0d280312543a024087708ac29985b496
parent 8d470b7725c6e312aac4fa3be7a2fbd7115e0263
parent 0294816692f17f10ec1a76ff780b0e32416e70fc
author Baligh Uddin <baligh@google.com> 1377554455 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377554455 -0700

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

* commit '0294816692f17f10ec1a76ff780b0e32416e70fc':
  Import translations. DO NOT MERGE