tree 575b223736c994bf5db1fdd38024d924e2955890
parent ea227306d68c7097b9cb079b1bfa6157c1ec2d30
parent 64ec7929485746ff958537187fedb410ee629008
author Baligh Uddin <baligh@google.com> 1388084958 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1388084959 +0000

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