[automerger skipped] Merge "Fix memory leak of FileDescriptorInfo object." into main am: 35c25d3665 am: 42ac4be27a am: ffb032eeec -s ours am: f8bc957148 -s ours am: cc4bee7bf8 -s ours
am skip reason: Merged-In Ie88e2fac76ba0da92c434d2db107885253855696 with SHA-1 60e4b9c43c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2654063
Change-Id: I7798d7383989a33407b51253e95790e0aef00f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: