diff options
| author | 2023-11-20 23:09:57 +0000 | |
|---|---|---|
| committer | 2023-11-20 23:09:57 +0000 | |
| commit | 4a3873c8861cf426756360478e564fbe9000afab (patch) | |
| tree | e1c21b6936953d8b2d1c0de0453c2fb628725e1c /tools/aapt2/Main.cpp | |
| parent | 9a1d4b373de62c9de579ed7b5473aa0f819b66e6 (diff) | |
| parent | 064e53532158b78870f695ee08ec4f02a344f46a (diff) | |
Merge "input jni: don't depend on unique_fd cast to int" into main am: 47cf4f1645 am: 3decd36d6a am: 064e535321
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2835674
Change-Id: Ib45bdf40391762cfd793c577e21570a8d5bd87da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/Main.cpp')
0 files changed, 0 insertions, 0 deletions