commit | 361f35c656463bd49412f4a424cff73ead81e4b0 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jun 12 10:31:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 12 10:31:15 2021 +0000 |
tree | c5f01c97eee3b2d3a8808414ffee9a779bf8b1dd | |
parent | 1319f44dae5f9ca854dea4f789688c0e123adb2e [diff] | |
parent | e4f1adacdce9492da8eed064af4fb741cbb8e880 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e4f1adacdc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14943245 Change-Id: I5f2a34f173b53b89ee21dc07f9a71963d8fa613a