tree aee8bc6faa8995791459cb8fb286c6b3c86bbc6d
parent 23307cbb6b432b658b0fd7437dacfedd6298af94
parent 3f2f8d6df550da3dac167de743618e22afda8f44
author Baligh Uddin <baligh@google.com> 1354597239 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354597251 -0800

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