tree e447b29893f99c214e9b3a128523955e02412cdc
parent a297796a1d0e3a0585735f7941b04ef5f970425d
parent 70aefc336924a038cc6310f84bad6f4071709ee7
author Baligh Uddin <baligh@google.com> 1367510332 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367510332 -0700

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

* commit '70aefc336924a038cc6310f84bad6f4071709ee7':
  Import translations. DO NOT MERGE