tree a89596e77e57e80a582d8fe6b917b7ccf2e23f14
parent affe0b5f764274a34b2869de7c529df61c24de7b
parent 0c04bfae0925c09b102363d680e3260aaeba45a4
author Geoff Mendal <mendal@google.com> 1389823456 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389823456 +0000

Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit