tree feb509258c10f03f3856083a81d55e0b3a6f9cf8
parent ab024617898f9a00ef53356ebdbd9c881635b9d4
parent 448e4e56161f86a1307a5720233bf2e21f201c0c
author Baligh Uddin <baligh@google.com> 1367712537 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367712537 -0700

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

* commit '448e4e56161f86a1307a5720233bf2e21f201c0c':
  Revert "Import translations. DO NOT MERGE"