tree 3e0d2efc9fdfe915f2b55455d406a88689bbf87a
parent b93a765ba69a292c268694e7ac127833e00a9b63
parent 9841174e07db12e46e5885485a8558313bb8c915
author Eric Fischer <enf@google.com> 1330989500 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330989500 -0800

Merge "Import translations. DO NOT MERGE"