tree fd4b1b62c956e028bb8552a92e5d4c3d07d6a861
parent 1cc4b4cd4a978be5164ab98643ddb8fb5929d261
parent 32767c40d652739997984b7b03e5575f37ec42fc
author Elliott Hughes <enh@google.com> 1618254279 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618254279 +0000

Merge "Make res_init() work again." am: f20b021903 am: 32767c40d6

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1670386

Change-Id: I21b2da41b9c8e1ccf88059e4db36b20baf0787b4