tree ce714abba29a6250530c8907f7be63f9177be9ec
parent 35ecec40a1fe150a42e7f843e4dd26dc47a37725
parent bd939aa399694aca0b9e0938633d3df68a82c93e
author Elliott Hughes <enh@google.com> 1516745584 +0000
committer android-build-merger <android-build-merger@google.com> 1516745584 +0000

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

Change-Id: Ie179f83c8cd281cdfb1e4fc4b4f1d1dfb29159f8