commit | 42f2c92d05b7528ad822815d224590593cc9ef5e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 18 19:49:50 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 19:49:50 2021 +0000 |
tree | 9d628461b426064171d49e3d37a13debf2436835 | |
parent | 2d792cec23ab42ee1b89f5d97997eb8e4dad6fad [diff] | |
parent | f32b7d1db5b73ddbb955af3760de6d31b6ef3b73 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31f749d849 -s ours am: f32b7d1db5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598034 Change-Id: I2a29eec1e61ca11dedf5932ed4a45216b02d6a54