tree 14971514409f8409292bbb598a65955c9ac8925b
parent 7f7adedaf995a3d3998fd2473b8d116fffce9e89
parent 131ef21ef81a25129b6ea7d0e70fd0555b3fc65e
author Eric Fischer <enf@google.com> 1334859091 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334859091 -0700

Merge "Import translations. DO NOT MERGE"