tree 3ebb5b9f6772bead4153f58aff5a27b35303709e
parent 3a1c1c1139e9b3429b0c183bd6d7ddd50adaaa9a
parent da1f77aef76730d13904ac51daf72d553d7fcbc5
author Ying Wang <wangying@google.com> 1342119707 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342119707 -0700

Merge "Import translations. DO NOT MERGE"