tree 15f1904ad94d52cd214a3b36174236d61ce16471
parent bf321b97213a35a63dacbf3fded8fb9ca4cc63be
parent c4dd37696681089c48dc77c877289b7336a2a217
author Baligh Uddin <baligh@google.com> 1383796502 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383796502 +0000

Merge "Import translations. DO NOT MERGE" into klp-dev