tree c0a5e08f62b083d5c98416aa9b87983e8ed8bf02
parent 5658ca5457d80ecc515a3b6a29afbdc46ffef236
parent 20255b65278cd86c346dbfb6d2d7702cef28c6ff
author Baligh Uddin <baligh@google.com> 1382644008 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382644008 -0700

am 20255b65: (-s ours) am 53834361: (-s ours) am 4f4b2bf0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '20255b65278cd86c346dbfb6d2d7702cef28c6ff':
  Import translations. DO NOT MERGE