tree 8ec384f46274cfb5238372cd519bc93b242af065
parent bfa10630c8da31b0a15095a6432595f12927dd7d
parent 078e3602d62caa3a862c2edb821193479e655c44
author Baligh Uddin <baligh@google.com> 1349137833 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349137834 -0700

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