tree 62bcfdee43a168ebfff2c1aeddebbd92712c96e8
parent 0a386ffac026e259c408b77c2dd2cc5d2e22b5f8
parent 3b1ca7888ca3b0b6988deabe644226f47b0f82ce
author Ying Wang <wangying@google.com> 1342211979 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342211979 -0700

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