[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e729110c1c -s ours am: d2d1124211 -s ours am: 94c90684a3 -s ours am: bc87635500 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992931 Change-Id: I2a5af4b5e8856882e1d2f9e016d735167306cb0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: