tree 8860c4adc38ec276c9aef344a0cb9cf15045c61d
parent 0979013d1b4e365673dd36807a7832c153f369bc
parent e0ad213ab24f11543b6d24d5726467bb370c77bc
author Bill Yi <byi@google.com> 1526825506 -0700
committer android-build-merger <android-build-merger@google.com> 1526825506 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 0f5574a23d  -s ours
am: e0ad213ab2  -s ours

Change-Id: Iba345ecb03d6b1a85013b8e24109258de0bde578