tree 4aa127e08b8b00aba44e0eed72c527ec4d47fd8b
parent 62edad0f14b16a1f0a2f04de8fe0708270971730
parent 017c22dbb5cdd2ab9667d769c546b368be0215b0
author Geoff Mendal <mendal@google.com> 1413848819 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413848819 +0000

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