diff options
author | Ahaan Ugale <augale@google.com> | 2021-08-19 06:38:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-19 06:38:47 +0000 |
commit | 9b37146f9dbb2c2250dac3a186b622b1cd383094 (patch) | |
tree | 7a3fb934d56bb706fc47860d6e89da5cf55a6d1a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e8d91fffdebdd828ceaec4a9b373bcbc87cd3d52 (diff) | |
parent | 45b16df600a1fd70af1539b0733397f80c8f2c51 (diff) |
[automerger skipped] Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into sc-dev am: c0f7c384df am: 45b16df600 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15606284
Change-Id: I3ad85e7bb05b3ef7a72b83e14253117e74ce9cd9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions