tree 390c4d341284910044b0d765314b67c067dc2ca7
parent 92cf3608b8f171f84f74ab1f7193a6a816063d14
parent 116f90c895b77073d32f056f18c433c29337d7d5
author Geoff Mendal <mendal@google.com> 1421365187 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421365189 +0000

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