| commit | 864c9fbc9ba2b64fb38731bafcc69fd800c2a722 | [log] [tgz] |
|---|---|---|
| author | Maciej Jesionowski <maciej.jesionowski@amd.com> | Thu Jun 13 12:13:59 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 13 12:13:59 2019 -0700 |
| tree | 12a8f7b1a9f5f22084990dfeeb19ad42de1c7453 | |
| parent | 6e23ab2add735f2724d005e8ea0097aeb81ae1cf [diff] | |
| parent | 23a2cc05bc36df1ca986ba93af326a09166d1357 [diff] |
[automerger skipped] [RESTRICT AUTOMERGE]Fix a merge error after adding VK_KHR_driver_properties am: 23a2cc05bc -s ours am skip reason: subject contains skip directive Change-Id: Ie4efedff77e7a8032462d12216448ed671d796aa