tree d204fbbb017ce668def352c9d2e1322576d4f8d4
parent 64667070a0c9d8f5b85486a39cb9bb4e9dd5625b
parent d5862f3e73c95e7a4738dbe0bf6dc962bb26a5cb
author Baligh Uddin <baligh@google.com> 1395780082 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395780082 +0000

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