tree 9b1b2c31aa28f8fc7fda64f18310fe5b4ba0d202
parent cff401395893158d08e89acfc678add481c8f1bd
parent 253372df3eb7e144b3b0662d2e92e058795f4b5f
author Eric Fischer <enf@google.com> 1335995345 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335995345 -0700

Merge "Import translations. DO NOT MERGE"