[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c78de62d02 -s ours am: 49547c44ac -s ours am: 15092f130f -s ours am: 17d1f98b54 -s ours am: 7ed43776f7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23130002 Change-Id: Ia16b601524706056de60fc20f711944aff4b3894 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: