[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3520f7482a -s ours am: a780c8afe5 -s ours am: 4648c36c57 -s ours am: 665f358efc -s ours am: d8e1470bd5 -s ours am: a938afe5d2 -s ours am: 1137a4a994 -s ours am: 45a120f1f7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15875815 Change-Id: I12ff58e7d07a79aacbd529108bbab708d54553e6
This commit is contained in: