tree fda3d327b65de8f0f9b8825a8bcb4cfb086041c9
parent 8c4ca9277dcb92cb965a1e58eef59ad9868ae44e
parent 457ebaf51d1f152a88534ed7863dd99ce8b6d262
author Geoff Mendal <mendal@google.com> 1414434020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414434020 +0000

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