tree 91e7d8e3506a9bb8860e7d2d829111a3f80ce7f2
parent 9fd7559813898f2c0da713add24a08dfab6f864d
parent fa8acb32200b2aed3221f50385f64ee2b6ab70bb
author Jeff Vander Stoep <jeffv@google.com> 1508866710 +0000
committer android-build-merger <android-build-merger@google.com> 1508866710 +0000

Merge "Check that dir name is a pid before attempting to read" am: 6419445383 am: c923127e23
am: fa8acb3220  -s ours

Change-Id: Id2abc9f0404c3107439e7cf2fb75bb6aeeb46c75