tree ecb3cf01b9b4fdafecc74027f25bf3968df01904
parent 39a12d163a9dcadff3f9c00f2c582851ef4301b8
parent f7fbbffa16cb4201d377b9fe766abe65c617353d
author Baligh Uddin <baligh@google.com> 1382581515 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1382581515 +0000

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