tree 35ec192587db11bfe56c180305c0471cdba8bcfb
parent 883077a217a7c488a0aa6c6389ba72c71df00ce0
parent 0ce843cbdb4879482d2cd15e8e6ef4d2fce296a5
author Baligh Uddin <baligh@google.com> 1408729158 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408729158 +0000

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