commit | 09f3ae42e489eb2ff6d9525ec20b28cbf2cb830d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 21 23:04:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 21 23:04:25 2020 +0000 |
tree | 28634386a64fcc8f1ee6cc4efcfdef2139ec86b3 | |
parent | 9fa492bcd69e2497be7d09c804cdcd805e9ce0a0 [diff] | |
parent | 429ae48fc53e199c6e7f164c7b90f567bf213b71 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d379a76ad4 -s ours am: 429ae48fc5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12423850 Change-Id: I2da179ad9c22f2c7f313675c89bfd00d579d4bbf