commit | 38b00969e879aaef6f0e3511a52b81ce677c76aa | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 15:08:21 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 15:08:21 2020 +0000 |
tree | e438ef22e0f062feac1b33fea870b1157860977c | |
parent | 836eee53ef1903e59543226175c5b823018ac1f6 [diff] | |
parent | 70517ab022450980e611a9fd1cb7320b309d7432 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: cfe0491c27 -s ours am: 70517ab022 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779776 Change-Id: Ida6baaef29e2fda1b2c8076abb3ab841ca8fe18d