tree a196393af263f947f6a28685a1b7c35699367107
parent 10a604da5b6781cb0d01aa4aefb1b55468cadb09
parent 75fda68e844a62e87f14d7f1c80b0e388c91f224
author Bill Yi <byi@google.com> 1470303288 +0000
committer android-build-merger <android-build-merger@google.com> 1470303288 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3ff12c2a1b  -s ours
am: 75fda68e84  -s ours

Change-Id: Id869d5122151efbda701351f175831d7b8caf078