| commit | 30bc6bf3d0f973e49177265016d64bbe12e01962 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Oct 23 20:24:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 20:24:05 2020 +0000 |
| tree | 8b23e7572d88104a1c56d1ad132d41f80c2be1f7 | |
| parent | 0582605da71cfffa76f102712db596379482ea04 [diff] | |
| parent | 479e5b17ef42ee2ff0a99b376a081e52b90ac3f8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b7dc979577 -s ours am: fba69cad44 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470260 Change-Id: I668a3b52ea71aa484a8a56f4835764a778398324