Skip to content
Commit 5e10ceb3 authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream' into master 

* 36518a61 Merge pull request #133 from colincross/glob
* ced59eea Add better error message when stat returns nil

Bug: 32676828
Test: builds
Change-Id: Ia3b78063db0d96bd0809fde65336c65453819a72
parents 4dedb64f 36518a61
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment