tree da5bc43aaea98072e946bc4c46c4e6fc4a24561d
parent b8f3131893b85bb21aa43cfed867b42eb6301be6
parent 380ea79a563ef450e043b3d82276445e7dd11bcd
author Eric Fischer <enf@google.com> 1337030952 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337030952 -0700

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