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