tree 4c0bb919dbfd4c2ea451ac6e972f3541b0735b11
parent 57d39a3d70cf820e830c351d9d7fbb5d16d42ecf
parent de4be3bc2c4d330c02549619b8a4c72180bc7cd5
author Geoff Mendal <mendal@google.com> 1426511142 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426511143 +0000

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