commit | 62b17de348ac368e920ee9f6e387bfb18c6d2c9a | [log] [tgz] |
---|---|---|
author | Roshan Pius <rpius@google.com> | Fri Oct 20 03:40:46 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 20 03:40:46 2023 +0000 |
tree | bc41585a5fa64f4a49c4e6f4b57c9aeb5378bc53 | |
parent | 770be83e3a737f9609ef288a93800f4851226c10 [diff] | |
parent | dc8efa9bb89875b45c8a5a3e4c974df78fb8fa34 [diff] |
[automerger skipped] Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f621432634 am: dc8efa9bb8 -s ours am skip reason: Merged-In Iecbf1b58ee2305c509da9c90cd421ee0cb91d379 with SHA-1 517e8a3fac is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2795936 Change-Id: Id581489b4995eab60d2452fbcafd428bd46aee59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>