tree dff3f05f60dd28654deb67d55cbc01c763613d95
parent a232ed6a724f00560370439ff3b80061a0a569b8
parent a45a568616edd6461f2387f5c7045b6b6aa8af0f
author Ying Wang <wangying@google.com> 1342464490 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342464490 -0700

Merge "Import translations. DO NOT MERGE"