tree 14a65974b35a00b5e3cff2ef53e4d1ea76cb989a
parent 3efcd8da613184e58ea1b23d37c1ad3bd2a141ca
parent 014aba26ed1a31224e4ac41cc8630b2b6f6338a3
author Geoff Mendal <mendal@google.com> 1417014634 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417014641 +0000

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