[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c
-s ours
am: 1ccff0ddc6
-s ours
am skip reason: subject contains skip directive
Change-Id: I69d8e92cdbaca6f83a068ed2507b623728c8eac3
This commit is contained in: