commit | ac196b102329016b2dc2068cca3f80c29e0ab019 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 17:20:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 17:20:33 2021 +0000 |
tree | 219e60d3860f955446dce898ce98e35e1f179c65 | |
parent | 4fdc70c7e48676b2391fc9b1b5f83448645aefa8 [diff] | |
parent | 79ebe8fe0902e1a92ced2235a9f6725947c43a78 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59f64e1e92 -s ours am: 79ebe8fe09 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755759 Change-Id: Ieb35387ac514ee7e301f422557f9de6cf53a165c