tree 8ef8fba868b7665d83015645cfdc67f403468216
parent 61917d28f13a860f470376ccbe55c50bf834942c
parent 9757bed90a173dd59526b1e36360ce0401f70dda
author Baligh Uddin <baligh@google.com> 1379188466 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379188466 -0700

am 9757bed9: (-s ours) am 4a9fca80: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '9757bed90a173dd59526b1e36360ce0401f70dda':
  Import translations. DO NOT MERGE