tree a0810d34031bb524c6a8276bc55d0c3b98511eea
parent cc3ff173445929c97ff3be07e7813b14aa18df01
parent 0a77d682376df881bced0ff203559ca05e6df415
author Baligh Uddin <baligh@google.com> 1368834014 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368834014 -0700

am 0a77d682: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denim

* commit '0a77d682376df881bced0ff203559ca05e6df415':
  Import translations. DO NOT MERGE