tree 75f1ed63f018e9e38890011edab18e670b61e481
parent c6a2fa8cba32f5310a052cea2307b898f0522fab
parent 0503ae7451761eb9d4868014caf924cfd0937ab2
author Ying Wang <wangying@google.com> 1340833280 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340833280 -0700

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