| commit | 6f5c844f866970be34ff9c170205bdbf495cf141 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:54:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:54:21 2021 +0000 |
| tree | 219e60d3860f955446dce898ce98e35e1f179c65 | |
| parent | 71f14fd37bde44fc2efbab0df054646d76a65a6e [diff] | |
| parent | 0ab5ca6ae81427c9a5a3527ed2a76b83e2f480f1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0ab5ca6ae8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15199718 Change-Id: Ic476fa7bca6997c935894dcc83e0cd760201be07