| commit | 2b14ff15d09ecba1ccc3c9a133eff873149b9ebc | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Fri Oct 20 04:15:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 20 04:15:55 2023 +0000 |
| tree | a868559e1d0db6518afa7f7da5377f95bc746535 | |
| parent | 0b561d0c15ae44d250a6669094e104daaa7ac11a [diff] | |
| parent | 62b17de348ac368e920ee9f6e387bfb18c6d2c9a [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: 62b17de348 -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: I17a6098acb1f7d782b592102607f2c74fbaaa193 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>