tree fc863d7c20a49306aa6763046e9b74c5a7edce64
parent 38e7a6af269b89e9b2c40f498a93bfa9f842f610
parent 26970efd230288e78e64da60df1c6e10593dcbc3
author Baligh Uddin <baligh@google.com> 1396923627 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396923628 +0000

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