tree 64e1d26306c9a4b34ee4a5244a36f9937c65f312
parent 0e5b160418dad25b9e7125d2533cc8770b1cd9c6
parent 366703288c7f2e2037aaad080e1e3fac2aa701de
author Ying Wang <wangying@google.com> 1342817856 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342817857 -0700

Merge "Import translations. DO NOT MERGE"