diff options
| author | Mika Isojärvi <misojarvi@google.com> | 2017-09-29 21:08:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 21:08:30 +0000 |
| commit | 516242fe3b4a587427ee71a1483931d687a580da (patch) | |
| tree | fd9b01bd402b488321b6b9c2e3c57b261c70bf0f | |
| parent | 95ff2db8f04be5aac1f05aaf45f4fbedc1fef71a (diff) | |
| parent | 7fe81266ca561b9fa16684a0a3ea63f0bd4d9646 (diff) | |
| download | deqp-516242fe3b4a587427ee71a1483931d687a580da.tar.gz | |
Manually merge commit 'dca7986977634190a639e9d2436dcbafd8a4f34c' into oc-dr1-dev am: d734f67e06 -s ours am: 9372fc61ad -s ours
am: 7fe81266ca
Change-Id: Ie6b12dd72003dd1d745af6bc8a1a49f0b8b80fbc
0 files changed, 0 insertions, 0 deletions