tree 24e3d276f1739047fd296837e13ad53800a1e753
parent f80afd795eb9da17c6cb9e44f77776b69ff70575
parent fdba3ff00c08215886eec94c0cf5950fcb9c4ba2
author Ying Wang <wangying@google.com> 1343159223 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343159224 -0700

Merge "Import translations. DO NOT MERGE"