Merge changes from topic "am-dddab5aa66a34c29a56655e9be0a2f79" into udc-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:d69f19c92f
-s ours am:77947a99f3
-s ours am:83fb70b58e
-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:f32482d0d4
-s ours am:4da3116de6
-s ours am:2eddca314f
-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:1e7e184419
-s ours am:63d6e269db
-s ours am:ec3f5399ad
-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:0cb680936f
-s ours am:02a083d573
-s ours am:ed50db98a9
-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:d4053e03a4
-s ours am:639a014add
-s ours am:b3bb5acb87
-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:f83f62f608
-s ours am:b128113876
-s ours am:48bdacaaf7
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
28b4385e19