tree efe4a559bcf7136be23d2c51afa14f530534e044
parent a2c628fb402610ce65371fb06d5adaf7eaf9df9b
parent 25dcc321f70f9fdb284d57bd56ab6f935225fae4
author Eric Fischer <enf@google.com> 1339015980 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339015980 -0700

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