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