tree e48e83a79df7038ffaa9e118dde7da0c04311759
parent 0e86b893241b8c38598472aa40dc470ad27ba145
parent 6ca9cfe313bafd3f2ef8278140d2a8fe3ee67de3
author Shinichiro Hamaji <hamaji@google.com> 1453800970 +0900
committer Shinichiro Hamaji <hamaji@google.com> 1453801026 +0900

Merge remote-tracking branch 'aosp/upstream'

- 7cf1935 for 26707439
- 271c580 for 26438312
- 6bbf9e2 for 3x faster --regen

6ca9cfe [C++] Use thraed_local keyword on linux again
c8154bd [C++] Fix a race in stats.cc
12f41b6 [C++] static_pattern.mk is passing
ceedf3f Do not use implicit wildcard in prerequisites
fcbadb2 [C++] Trim leading ./ in output patterns
7cf1935 [C++] Show an error message when exec in RunCommand fails
271c580 [C++] Fix target specific variables in implicit rules
4197da6 [C++] Fix Mac build by using pthread's TLS
6bbf9e2 [C++] Run the regeneration check in parallel
8ef0ce5 [C++] Move NeedsRegen from ninja.cc to regen.cc
23a0c47 [C++] Make kati stats thread safe
9588ae9 [C++] Do not calculate stats without --kati_stats

Bug: 26707439
Bug: 26438312
Change-Id: I5aed3af2fe71e541edaf22a15100492df1e33210