commit | 0fbac847ccb6032d9b481214b527e3ccbcb5c6a7 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:15:29 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Sep 12 13:15:29 2021 +0000 |
tree | d63aed2250a82ef7196b803417f8b49eb1b66032 | |
parent | 2f5f1ee981a47f98066252532611dfb16459ab48 [diff] | |
parent | 204bcd70fa8c0b3ef9b7c8e9c002d05c5426dc87 [diff] |
Merge changes from topic "am-972234a1128d41e38f2888eefcea5f48" into sc-qpr1-dev-plus-aosp * changes: Merge changes from topic "presubmit-am-fa6802abdeff4b8ea35356d58a58bda6" into sc-qpr1-dev am: 5f90e5cdbc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b5c9411929 am: 0c652cdb66 -s ours