[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours
am: f85844d8e6 -s ours
am skip reason: subject contains skip directive
Change-Id: I71ccaf502f0cff035cfc533f6a1183382b79fdb2
This commit is contained in: