tree 3e24d239c47449a1833ce81ec3bba9b164940e0c
parent b30faa234b4624318bd5ea1c30db1cd2e0e6e807
parent 1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02
author Baligh Uddin <baligh@google.com> 1409160273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409160273 +0000

am 1ac363fc: (-s ours) am 68eb6f7b: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '1ac363fc4d042d83a2aa15cc0e9ad0a53671cf02':
  Import translations. DO NOT MERGE