tree 5aa941aea35fddf1beddd5cf94e4f0b4ca781e98
parent 96853eb87db00a793fc3d465a2c6a0b92af250ff
parent b1056852a55c00df58f0b7d728ad7395b1111f7c
author Bill Yi <byi@google.com> 1474547524 +0000
committer android-build-merger <android-build-merger@google.com> 1474547524 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 994ec6a0ec  -s ours
am: b1056852a5  -s ours

Change-Id: I01089f7bf4258e4e894f2a2d996b6750e17c5e7b