tree 569f2538f268d8267ba7b8caa340d84f86cdca77
parent f7fb3acf8fb92890b0a2b9cc0b238e5df80e1cf5
parent d56bab2c623e2bca13ecfcb9d76e8415ac7c698c
author Geoff Mendal <mendal@google.com> 1413992972 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413992973 +0000

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