tree 336f7478c8214c95428cb1f4340bde6ed4eba26f
parent 39217055fad3ee87bf912ac9a2ad7b186cf73eb4
parent 59f3f45b5baebc4576c345b67e34cd2f14036e13
author Geoff Mendal <mendal@google.com> 1413209842 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413209843 +0000

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