tree 6cfd084ef6cf26e1c14ea7f06cfc6429c6bf879d
parent 9e390fb5d1b4d31998c01beeb5adc9ae84123612
parent 5eba8f8978d8d91ecfea9e6f83ee0d9b3b918d2d
author Bill Yi <byi@google.com> 1483094594 +0000
committer android-build-merger <android-build-merger@google.com> 1483094594 +0000

Import translations. DO NOT MERGE am: 84cd5cbca0  -s ours
am: 5eba8f8978  -s ours

Change-Id: I4fc286b2adfdf79b5f13bf4c318ad0d895e0ee6f