tree 55a38a7630fd4bfcc45ce882aa6ff31ce0ff0f23
parent 3ab778862162979884753cf01fe448386080a13e
parent 190713477ede2dc707314bdc4329c4b53908f059
author Bill Yi <byi@google.com> 1525673422 -0700
committer android-build-merger <android-build-merger@google.com> 1525673422 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 9251be1413  -s ours
am: 190713477e  -s ours

Change-Id: I8ec8d7da4217c7632e0cc7d88676d7698f9a1b33