Merge changes from topic "am-ee1e11b48ff64035aa2f6bbc85aea648" into udc-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:ba4dc8f0bc
-s ours am:12ec34641e
-s ours am:7e87dbe180
-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:ea2e6b3670
-s ours am:fe99021d55
-s ours am:702dadee71
-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:d8d85a8485
-s ours am:04f844c712
-s ours am:e5649218f3
-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:7d99401b8e
-s ours am:5e71a3fdf4
-s ours am:ff6629bf08
-s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am:8c296cdd64
-s ours am:f14e96fe88
-s ours am:d38c1958fa
-s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am:d152c7b1bf
-s ours am:4fdf445fc4
-s ours am:6b2bcbd3ca
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
76b9f31667