commit | d620b4611ba63f4ddbbae6f446479c6ba9cdda91 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jan 11 01:25:20 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 11 01:25:20 2022 +0000 |
tree | 215701b535f767f591bcac63ff6e9345e86cc435 | |
parent | 29ba25c12449aa8902f474448348fd9398b86651 [diff] | |
parent | bb5a6b3d92cb49a88bbcb36a0aa644cc071fc501 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 609ddd2029 -s ours am: bb5a6b3d92 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16598376 Change-Id: I7222500c8abc9f64dca8191c29052b09c0735056