Elliott Hughes 7ec725d41f resolved conflicts for merge of 53caaaf6 to master ...

Change-Id: I20d265364b09c64d3637e57f500e934ee2310887

2014-06-16 15:34:25 -07:00

..

darwin-x86

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

2014-04-09 16:19:44 +00:00

linux-arm

am 7f880d15: am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."

2014-06-13 00:48:36 +00:00

linux-arm64

Remove useless stuff from "AndroidConfig.h".

2014-06-12 15:36:52 -07:00

linux-mips

am 7f880d15: am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."

2014-06-13 00:48:36 +00:00

linux-mips64

Remove useless stuff from "AndroidConfig.h".

2014-06-12 15:36:52 -07:00

linux-x86

am 7f880d15: am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."

2014-06-13 00:48:36 +00:00

target_linux-x86

am 7f880d15: am 553c289a: am 624220c1: Merge "Remove useless stuff from "AndroidConfig.h"."

2014-06-13 00:48:36 +00:00

windows

am e9966aab: am 79a9a324: am 3342bf0f: Merge "Windows SDK: define BEGIN_DECLS/END_DECLS."

2013-11-08 13:42:20 -08:00