tree 8e96c323f88b28560ec6711e403ebbbef5a7e513
parent 69eb7bb5103a81499bbf7a0a48507ef630cc73d1
parent dcbc8ec29a148b0a3fdf675d91b77141325a3a36
author Steven Moreland <smoreland@google.com> 1602279405 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602279405 +0000

Merge changes from topic "I81ece86ace916eb6b435ab516cd431ec4b48a3bf" am: dcbc8ec29a

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

Change-Id: Ibda51d9f321b5bbb4860be054f83bbf7859bc8a3