tree c256c2e6afe193bf96ec1f34a763cb8f598119ec
parent 99296322bc5ae3aabf89bd2b424492ec93b35c1a
parent 18b7abffef090b06115b4aa7b8260d678987617c
author Baligh Uddin <baligh@google.com> 1380125946 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380125947 +0000

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