tree c74fef523ffba968e96e0d83732356fcb4dd00d6
parent 7fbec10b36818f100b631f3d73fe1ad5360975aa
parent c003756a867ab5a7b4c573cbe24021cbcbdd03d3
author Eric Fischer <enf@google.com> 1332887867 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332887867 -0700

Merge "Import translations. DO NOT MERGE"