tree ed1b31fc86ab43f06b389845a6ef21b58d149cbb
parent 1e8bd3668a6bf99ac8c2fba28e86ecfd0a9753f9
parent d64d24226ffe2e84e5814a782cb58c1606b26c6c
author Bill Yi <byi@google.com> 1501120754 +0000
committer android-build-merger <android-build-merger@google.com> 1501120754 +0000

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours am: aec51f497c  -s ours am: a204358b18  -s ours am: 1c7370cf31  -s ours" into oc-mr1-dev-plus-aosp
am: d64d24226f  -s ours

Change-Id: I5123f18d25932cbcfabe2c674bf9dd778fbec0c2