tree cc84a420b5ce80ea118b7b96e62d50a17378a320
parent 0f84a604563037ea65883b99d30e7ff802d986c2
parent c83dfbea5177ca3faeea72a9f9b970d5c77547ef
author Baligh Uddin <baligh@google.com> 1380579951 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380579951 +0000

Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose