commit | 22bca9c10b2532884dc12ed15796d650e717b111 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:21:42 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:21:42 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | 5bb0f603f956e118f06abcf5a683b2012caf05b6 [diff] | |
parent | 336114b4b7f1a2dbfa800d9d095cc5fa8b3cd53a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours am: 336114b4b7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519350 Change-Id: Ic1c06bdcfd2bb730b61315932f48501bb52bbcd0