tree 6da714f6efd0a84a4d77189d09a48416c6e36ee6
parent 194232f03b5f8108540fd52f2fa56cdabc82e3e6
parent 47006127731a472804002876a6d03da41a859d5d
author Ying Wang <wangying@google.com> 1340825461 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340825461 -0700

Merge "Import translations. DO NOT MERGE"