diff options
| author | 2022-03-25 11:13:58 +0000 | |
|---|---|---|
| committer | 2022-03-25 11:13:58 +0000 | |
| commit | e7b4cbc1a13d12e32f85ee14566cc65614e6b3bb (patch) | |
| tree | 1646d2fd5183b9e280e20f0d152f15dc8e6f108e /libs/androidfw/AssetsProvider.cpp | |
| parent | a719a69404f61efc8551668e9e4661af16bce1fb (diff) | |
| parent | c1840b3fd52809d2628f840c4b395d68430dd051 (diff) | |
[automerger skipped] Merge "Trusted Hotword: Allow disabling periodic restarts." into sc-v2-dev am: c1840b3fd5 -s ours
am skip reason: Merged-In I3b17b47fab4120b42d75443b213be3c1ef5491aa with SHA-1 fc651fe0d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344015
Change-Id: I210ba0fdacd35ae47c02f31311fb48fd7db8ce2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions