| commit | 62e8cf20e5f7ef2657ae8d6f0711cd2b851aec17 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 21:48:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 21:48:21 2020 +0000 |
| tree | e5223e7baa5bf344210ab0c958a391a322f6d0f3 | |
| parent | 6c6a4c1270d14068fe53fa0bc4cfad0873f9dad3 [diff] | |
| parent | 394274894d834748c127ab190ba59194d206d3ae [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9d8b718f26 -s ours am: 394274894d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167504 Change-Id: Icda3bce3225b85ad1dfc5d2184e8f4074c8cdc6f