Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Mon, 18 Dec 2017 18:58:37 +0000 (10:58 -0800)
committerChris Forbes <chrisforbes@google.com>
Mon, 18 Dec 2017 18:58:37 +0000 (10:58 -0800)
commitd694c4589983313edb42415575faba19cfb804cd
treeeffdcf2067abc7831884f820b2928cfd20dd62bc
parent44ca27bcbfe7120a377865d60dc3686ff0d668f3
parent62b142f433a37145a353072f7b90c227aa98b2dc
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: I4d373d9415e648dce80dc7c6112df5743a34cb54