tree adefa94ed6905e297ac0eb0669bd98692e769fa1
parent 6aea44c850a041c495f0b572e0b5c55be6499136
parent 1705847acc2cbda9ffabb354854b23b1ee3f3e38
author Baligh Uddin <baligh@google.com> 1367712168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367712168 -0700

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

* commit '1705847acc2cbda9ffabb354854b23b1ee3f3e38':
  Import translations. DO NOT MERGE