tree 490f25fb9214de750410729a2758ce8d10df5092
parent dd026a6d01375d1abebc7f5b2e69912515b52cd2
parent c76b9f146a7307cff56fc40269c030d473901b2f
author Dan Willemsen <dwillemsen@google.com> 1487911324 -0800
committer Dan Willemsen <dwillemsen@google.com> 1487911412 -0800

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

* aosp/upstream:
  Randomize cpu affinity
  Be more resilient to directories disappearing during startup
  Pass a Loc into FindEmulator for better warnings
  Add --color_warnings to make warnings/errors like clang
  [AUTHORS] Fix kati instead of glog
  Add Koichi Shiraishi to AUTHORS/CONTRIBUTORS
  [C++] add +build ignore magic comment for go build
  [go] fix ldflags foramt to add '=' for -X flag
  [go] fix stat.Dev type to uint64
  Allow rules to specify custom ninja pools
  Fix some possible performance issues found by clang-tidy

Test: kati tests
Test: multiproduct_build on aosp
Change-Id: I4c427dde2bb9d1a0970e97d1e822e093bd269dfe