tree 6d6fe3d5d21a2d32d5b2136fe4a43b2a1efc35bf
parent 7a59805724ca151641dd1cc51337d44657aa1560
parent f3e48a7a4285bd8296ddbf713ba6236b196b5e0c
author Geoff Mendal <mendal@google.com> 1423772275 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423772275 +0000

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