diff options
| author | Mika Isojärvi <misojarvi@google.com> | 2017-09-29 20:09:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 20:09:13 +0000 |
| commit | 9372fc61ad86ca06aff975e4f37d64a89733ad05 (patch) | |
| tree | 619bb75cfe81bf9cc69fea63e938d07de857cf1d | |
| parent | 881bba9de6689f8e55dc815d0c51c071a633da9b (diff) | |
| parent | d734f67e062b0f0265e41dd3a6c06de6938e6985 (diff) | |
| download | deqp-9372fc61ad86ca06aff975e4f37d64a89733ad05.tar.gz | |
Manually merge commit 'dca7986977634190a639e9d2436dcbafd8a4f34c' into oc-dr1-dev
am: d734f67e06 -s ours
Change-Id: I746a692b3525b7a845179423d6e2c20270e0c52c
0 files changed, 0 insertions, 0 deletions