commit | 7eeb1f57e857c09212b1981e173db302883ddf69 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 23:46:59 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 23:46:59 2023 +0000 |
tree | de61f308763f6915abf6d0f5039539c29d339409 | |
parent | 4ab804e60bd55affd2f6e47c12bce0b2360b353e [diff] | |
parent | b82b7b3945c044060ee1c20864610b26cf06bcc3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 2c9b776ce5 -s ours am: 59cf1d6ce1 -s ours am: 10e1e15b81 -s ours am: b82b7b3945 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616456 Change-Id: I68c3e13673d55e4333f8a925435e30451c4705a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>