Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:767a923ecd-s ours am:11f279fcfb-s ours am:00769fdce2-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:6b8c61c9a6-s ours am:265171b600-s ours am:f54aaa1106-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:d28f600d0e-s ours am:2dc66817ed-s ours am:af736477bb-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:e69bec0564-s ours am:aff5a4b154-s ours am:35727e14e8-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:3b7b23acb8-s ours am:27ef5fc280-s ours am:f2a8b2e09a-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:be6f57545f-s ours am:0781830995-s ours am:4e4c2e91c3-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
49f3ae7345