tree eebaf88fe1c5f5585405837567f37c65a0ea4a3c
parent 11b319c234ef32b6ebd4fb8f44f592c491281de9
parent 351d7e2e382d4e94cf545b26997940af97b97ba7
author Baligh Uddin <baligh@google.com> 1403544291 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403298034 +0000

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