diff options
| author | Ahaan Ugale <augale@google.com> | 2021-08-19 06:44:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-19 06:44:29 +0000 |
| commit | c04c9a4fabb5b96d5745052f74cb1fea55f167bb (patch) | |
| tree | 1206ca467831200c7174fc67c56e58637a486aa9 /core/java/android/util/SparseArrayMap.java | |
| parent | 33f83511fd037ec122063380ad5aab145b84c059 (diff) | |
| parent | cd14f0f7260003b92c20d8f537204cb1584cc628 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into sc-dev am: c0f7c384df am: fdd56be48c am: f30ad2c5b2 -s ours am: cd14f0f726 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15606284
Change-Id: I7ef49289ce8758fc5c6250a283fa33e997e3821f
Diffstat (limited to 'core/java/android/util/SparseArrayMap.java')
0 files changed, 0 insertions, 0 deletions