tree d3c2a52add3dd64a352be7e898a3cd0291655a6e
parent c00af20f0613cbfc2a2a650372840ac37789878f
parent 53ea7963d6a17b5f1327eac1bdeb071743465cb4
author Ying Wang <wangying@google.com> 1340825447 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340825447 -0700

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