diff options
| author | 2025-01-31 15:17:59 -0800 | |
|---|---|---|
| committer | 2025-01-31 15:17:59 -0800 | |
| commit | ffc4b8672e074f1fa0946e06cb46bfc992aced64 (patch) | |
| tree | bf44ca0297bacb47953855cf87c674223b6a0503 /libs/androidfw/AssetsProvider.cpp | |
| parent | 42568a536b9005196efef37a3a6619e06344933e (diff) | |
| parent | f8ab301692d2edc3f71c3dc8b453947bfda03886 (diff) | |
[automerger skipped] DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction am: d07e2cfe83 -s ours am: f8ab301692 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31451413
Change-Id: Ieb3478b8b0d2bb7f5eef28b932f289c6311270c2
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