am f59c8e4f: am b395a893: (-s ours) am 2067dff2: am 4968dd48: (-s ours) DO NOT MERGE...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:42:01 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:42:01 +0000 (19:42 +0000)
commit1ea6f97ed0f8cc6bbbeea54804903f06f077a786
tree4e2946cae76df1b855c626537a142ded9edcf6fb
parentab582069dad9ca9727cadadad0a733b5c460a0a9
parent020a94a8a3489b1d67c63759cec55dd7fa837dae
am f59c8e4f: am b395a893: (-s ours) am 2067dff2: am 4968dd48: (-s ours) DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. automerge: 4a3d88e am: b44040f02b  -s ours
am: 020a94a8a3  -s ours

* commit '020a94a8a3489b1d67c63759cec55dd7fa837dae':