tree bcc3fa89deaafebb094a852c5206f9add9b928bb
parent 50bdac61a10c5d0296dc0de7ad6c7f4ed59186f6
parent 1fada0a0122c72bba086bac04e7e63b9f8961bd7
author Baligh Uddin <baligh@google.com> 1383316541 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1383316542 +0000

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