diff options
| author | 2023-08-08 06:49:23 +0000 | |
|---|---|---|
| committer | 2023-08-08 06:49:23 +0000 | |
| commit | 4041fa3b241674bdcd8dd7c962eb43a08dd4977c (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/hwui/FrameInfoVisualizer.cpp | |
| parent | db4cceed315707a73a73f3b700b8b0a8fafc69d0 (diff) | |
| parent | 6c85440666d997161fb6d82b4a8c17c00f195d42 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours am: 4d517b4865 -s ours am: b1e88e3d2e -s ours am: 34cb892a71 -s ours am: 08f1a5c82f -s ours am: 98921ea24e -s ours am: 8384103619 -s ours am: d181990b38 -s ours am: 6c85440666 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: I1ea5ad190bcd846e73b90dfd935133ef28ddf87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/FrameInfoVisualizer.cpp')
0 files changed, 0 insertions, 0 deletions