Merge changes from topic "am-77a42f00787b410faef13ebe05aa4b9d" into udc-qpr-dev
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:fb393ff92e-s ours am:3882134c44-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:db8e8c53fc-s ours am:f1fdc08a0f-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:7503f46d99-s ours am:2d718e676b-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:83f0b70428-s ours am:f199e2b385-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:876a506297-s ours am:8fe288a571-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:a4fcff4b06-s ours am:cca1430ff5-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:865ac3bc69-s ours am:73554b71be-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:89812a9a40-s ours am:62f3233b4f-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:49dd4d9cff-s ours am:a32eb0be4d-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:60d4b310c8-s ours am:ced0d328cd-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:cd1658030a-s ours am:dd8f72c61f-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:5a0b878394-s ours am:cc7d4ac666-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:521ee620cd-s ours am:2bbd9c4e9a-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:9ce1b74193-s ours am:002038d7b1-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:955ceede40-s ours am:45d5b106e0-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:d7eba5dfb5-s ours am:d542e949d4-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:3f7ba22204-s ours am:650cf48c2f-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:0a060f6821-s ours am:d75c098a73-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:27c407e219-s ours am:5fbf56e486-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:bdac1455a5-s ours am:55119f7701-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:1d56d3e427-s ours am:1c80fb3c76-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:a1a2ad776c-s ours am:0b36f168dc-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:883cb3f05c-s ours am:e81961e7c0-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:40906275c3-s ours am:21d544ad15-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:770a6590f2-s ours am:780ca195d4-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:e66224619e-s ours am:07896e5bb7-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:39c1debafd-s ours am:18d10c9033-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:b9e05b48fa-s ours am:83ed1b1eeb-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:e03de69820-s ours am:af22581ccd-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:914f58f35a-s ours am:e00643a671-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:fdf5b94eb7-s ours am:545b5bb3ae-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:3f9747a4f8-s ours am:8cbac51805-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:f590909ff4-s ours am:54b1b9d46e-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:aa5d3a9c27-s ours am:18fa773714-s ours
This commit is contained in:
Automerger Merge Worker
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
a496a5bb70