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