Commit 979da91a authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Merge remote-tracking branch 'aosp/upstream' 

* aosp/upstream:
  Fix checkCalledFromInit

Test: treehugger
Test: cd build/soong/apex; go test ./... (with go 1.13rc1)
Change-Id: Ibaaee1656c6139cc015b86b1f78c849d00d964fc
parents 8f656270 3f22fcf3
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