tree ded7ac20fe956cac4009a43fe56de21f0d0d1ebc
parent 73ed17cbaf6c6a176a272486661117d2fa36b189
parent 966f26e75b8362a8848aa176d7e294ab3cea6e3d
author Eric Fischer <enf@google.com> 1332794992 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332794992 -0700

Merge "Import translations. DO NOT MERGE"