| commit | 40218c9bc85d2f132039addb26cc94c6743fc912 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Fri May 21 09:44:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 09:44:10 2021 +0000 |
| tree | 2cfac7e4001b1bc29542035d2b7aa55589a6743b | |
| parent | 0aa0790dec4556395b6766073897cf6f1c3c837a [diff] | |
| parent | f8a3b98311d6f6e0876556d0c38d071345d1da40 [diff] |
[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 544989351f am: 0def2a4e91 -s ours am: a2e59b47ef -s ours am: f8a3b98311 -s ours am skip reason: Merged-In Ic13f1d9832d5ae5b6ae4b96323025d9b695fdaf9 with SHA-1 a1a2ccb8d7 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089 Change-Id: I1ff9a13cf63497f09167844741e31b29d6632f70