Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 12 Jan 2018 18:33:20 +0000 (10:33 -0800)
committerChris Forbes <chrisforbes@google.com>
Fri, 12 Jan 2018 18:33:20 +0000 (10:33 -0800)
commit582c3cee18648ccf91eb9f032ddd405bcdd2cdcd
treebfae8fcfa649630d15e9e58a9aa2c8b662b18bcd
parent4165e2aaacc1111ecb5690165f8431c8247f7e75
parentb77437eac1314e9e0d2ab327fc061c9f67091357
Merge remote-tracking branch 'aosp/master' into deqp-dev

Change-Id: If6c19e0cbe0011053af9abe2632534ed23e8a8fe