tree 9a172a5d66d6758f6efcdfbc00b6aec5902d2410
parent 0c8802bb3ee36247f92300a1bed2ead77c436479
parent 099cce32d24e813607516c2685969ec883e28e1e
author Geoff Mendal <mendal@google.com> 1418656283 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418656285 +0000

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