tree c6250aeff2834b200c97efc1be56e040544fb58a
parent b70cfb9103b02e90409ba1f1bc334210f139774f
parent 718ba70f6e2bd6cfd8d1942567d6fc52194fe3a9
author Geoff Mendal <mendal@google.com> 1413410519 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413410520 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev