[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1360ebb441 -s ours am: 39b0da14c3 -s ours am: b1cc81c365 -s ours am: d89471ec58 -s ours am: 896784c81c -s ours am: 5206e4ebd2 -s ours am: 70f94abe74 -s ours am: 3336037847 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22455204 Change-Id: I99735f20e2eadd2af513bfecfbdcad33186b0a82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: