tree e5e8482b1e58fabd865dbe73a2346576d8f3fe30
parent f22037ae4ef9227fdf13ba9ae69d672e6efd2669
parent fe957adace94081614fc5459136072f33bf8aaf0
author Baligh Uddin <baligh@google.com> 1383317534 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383317534 +0000

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