tree b3c6f51a1f1d8b16646d15911adc738c8efa0c4b
parent d6d0afd9f3135dbcdbaaa70529e637c2059cccfe
parent 323633a57ad700d766be613e8e3021eff26a399f
author Bill Yi <byi@google.com> 1501089449 +0000
committer Bill Yi <byi@google.com> 1501089449 +0000

[automerger] Import translations. DO NOT MERGE skipped: 119bb836b4 skipped: 323633a57a

Change-Id: Ifee89ee583a6799636203a2644e0a77e0e23d0f1