tree 0228c42aa4201f5d331c40f8b3e0177b9100c829
parent f32d71aa5042dbbb33b10303eb5a4fb7a78cabbc
parent 79448832ce036dcfca862061817927ec2d277d73
author Eric Fischer <enf@google.com> 1336585929 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336585929 -0700

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