tree fc863d7c20a49306aa6763046e9b74c5a7edce64
parent 7309d9a2274a51d167bbc26f685303d0edd33dd9
parent bf752dfb535ecf661beeefa6e2cab8888f2b1030
author Baligh Uddin <baligh@google.com> 1396923631 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396923632 +0000

Merge "Import translations. DO NOT MERGE" into ub-now-master