diff options
| author | Ahaan Ugale <augale@google.com> | 2021-08-19 07:05:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-19 07:05:20 +0000 |
| commit | 5d6f6198fdae839931d88e4653df545d9e098ac3 (patch) | |
| tree | 1206ca467831200c7174fc67c56e58637a486aa9 /core/java/android/util/SparseArrayMap.java | |
| parent | 9918f55904d66bd7735dcfc5af135751156b9c3d (diff) | |
| parent | 39f0869b1eef459d976712bab6f9611c97d22194 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into sc-dev am: c0f7c384df am: 45b16df600 -s ours am: 9b37146f9d -s ours am: 39f0869b1e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15606284
Change-Id: I7a4894213db9263021e820fe7136dc7482bb9cba
Diffstat (limited to 'core/java/android/util/SparseArrayMap.java')
0 files changed, 0 insertions, 0 deletions