tree 7db9f4d874c2fa374e63ca0824295d178a72323a
parent 6223d006f545b7528cabee5e63f9fa2b772133f6
parent 4a0385f295a037292e05471990475e99d8739133
author Bill Yi <byi@google.com> 1497340368 +0000
committer android-build-merger <android-build-merger@google.com> 1497340368 +0000

Import translations. DO NOT MERGE am: b38e74160f  -s ours
am: 4a0385f295  -s ours

Change-Id: I2f44a7f47a6fad0896f5a36e4587b5dc4ef2684a