am 6c0fba0f: am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."

* commit '6c0fba0f989ce9755a4f4303149355dd0d4ea60d':
  Stop defining HAVE_TIMEDWAIT_MONOTONIC.

diff --cc core/combo/include/arch/darwin-x86/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/freebsd-x86/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-arm/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-mips/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-ppc/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-x86/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/target_linux-x86/AndroidConfig.h
Simple merge