tree d61fb7879db3f74f17c6ce4c989cd0dbac01e1af
parent 9b369b3e853d2f2e3cd52b141586f11d42da5ca5
parent 18db0829f5c0e6b67f9593d166df5fc357c9d4eb
author Elliott Hughes <enh@google.com> 1516744740 +0000
committer android-build-merger <android-build-merger@google.com> 1516744740 +0000

Merge "Work around readdir_r warnings until we upstream a fix."
am: 18db0829f5

Change-Id: I6276c6fcd4228fdf32cd59874b27e19c0170552e