Skip to content
Commit 305e1679 authored by Nan Zhang's avatar Nan Zhang
Browse files

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

* aosp/upstream:
  Support parsing int64 in Blueprint file.
  Make microfactory support go build tags

Test: manual

Change-Id: I6b5fcc6d1e9372d0b2e7b0274c34e2dcfd016351
parents 2e0166e5 e5500447
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