tree 02e9962c13ac600ddc831d7e9e7c6be68c4f6299
parent 1c2d7c336b876c1fce88ab31441cb9fa1e95203f
parent a204358b186377fd069e0725ff305a1c1062bb81
author Bill Yi <byi@google.com> 1501113332 +0000
committer android-build-merger <android-build-merger@google.com> 1501113332 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours am: aec51f497c  -s ours
am: a204358b18  -s ours

Change-Id: I70f15fc4332019f5bdfb21a7f092be8c968b438e