Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 3 Oct 2018 00:37:50 +0000 (17:37 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 3 Oct 2018 01:12:19 +0000 (18:12 -0700)
commited2f313b12142e8bdf8dd5deb466e44ca9a59b14
tree527d78df34778444b66d2032768d65748d7dd90d
parent3f534770ccd758709ef1d4179bfabc197009bfab
parentb57a8fe92b4d76ededea70b4a838b885abfb8e72
Merge remote-tracking branch 'aosp/master' into deqp-dev

Merge with -s ours; only change on aosp/master was for P mustpass
adjustment, which we don't want to propagate any further.

Change-Id: Ie16be989540969d0ac2b4423a290d1d01f17f376