tree 4f96a97a1e18849169858159ddb46f6bfc0a9ddc
parent 3024df77720ef44fd832794a1f4dfc7784ad3fea
parent 4f6d64ea0d857b7259c09e748b80f5224ada819b
author Bill Yi <byi@google.com> 1475134839 +0000
committer android-build-merger <android-build-merger@google.com> 1475134839 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4f6d64ea0d  -s ours

Change-Id: I8c75997247b73ca0c6856f5ba14587f1da01638f