tree c7ea2240f275fea44f76ece3d78abcc6ed02ba41
parent fc6902b66e3319279d88247b5610e0f45e9a5ada
parent ea97179dec42a6f39c00ec6cdd6d88bdf552fc3e
author Eric Fischer <enf@google.com> 1338918673 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338918673 -0700

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