tree d752c6e1ddfa2c51557c445ff7f1b786d2bf616e
parent dc7d4627418ee0e28db7840c95aaf58eadf7a7ae
parent 2d6cc0968e134ffde2cfb7fa13778809bdd6249c
author Ying Wang <wangying@google.com> 1343685690 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343685691 -0700

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