tree a76e6f757a640f5ef7c8f9f8e51b161c74602907
parent 1a5efec6a0ee9034b715a576f5ed108668069d25
parent cf6fa9f07095a006eb3f8b9107608c546dc465eb
author Baligh Uddin <baligh@google.com> 1347598721 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347598721 -0700

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev