tree c2e0234ef3fd736fa35a532db820709fc837b6e6
parent 26145e56f6e98733569b7093573fc26f44d3cfa5
parent f1b6498c116e136c7eb2c1b83a012789ac7ba470
author Baligh Uddin <baligh@google.com> 1378271020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378271021 +0000

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad