diff options
| author | 2023-10-11 01:21:40 +0000 | |
|---|---|---|
| committer | 2023-10-11 01:21:40 +0000 | |
| commit | 81090b4124fe355c02a0b80b289a9fd7bcf557ff (patch) | |
| tree | 3d208b8887e7753d07b544090460b36dca961629 /libs/androidfw/FileStream.cpp | |
| parent | 780c8cf64b9965dde08828f9ab3c7e13f835b0f2 (diff) | |
| parent | 263125245984acca47b987d298d33baa17d12747 (diff) | |
[automerger skipped] Merge "Remove obsolete Smart Lock developer settings" into main am: a1bb1ff8ff am: 3b12b17ea4 am: 728bbd56b7 am: 1885505c2d -s ours am: 2631252459 -s ours
am skip reason: Merged-In I6697b578712dfb57f9e709c541454b43e79d3a14 with SHA-1 0abf04ae3b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2731260
Change-Id: I831277f64f5b4b0aa80c21094f96ab79ac5d7c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions