commit | e98fe5bed6ec8a1d61539ec7deef0bc11e8955c4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:56:32 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:56:32 2021 +0000 |
tree | bc163ba196ce38ad2b7503cfa740bb3f8db2fec7 | |
parent | 4f46181a83a3419e7a037272e0ea20cab31075b4 [diff] | |
parent | 1ca07fd3e1b16239e962a0f5a8c380adfcf841f9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 50a4da21bd -s ours am: a7e6ae396b -s ours am: 96d311eb3b -s ours am: 1ca07fd3e1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15807020 Change-Id: Ic030e869fd03774438598be1d1e7b83ec4d5d092