tree 7addb8209744308efee8e66664d1d9f5322fde77
parent 7c67fcb2f983c08d9ab1ab65b0b877472d98dc06
parent 76f80a590b6f9670472af581df5c5c6e1837beae
author Ying Wang <wangying@google.com> 1340833223 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340833223 -0700

Merge "Import translations. DO NOT MERGE"