| commit | 889cd9aa94a6b0a8b90116ad7b9c6d70ceeaa5e9 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Sat Feb 25 22:12:23 2017 -0800 |
| committer | Jesse Hall <jessehall@google.com> | Sat Feb 25 22:16:01 2017 -0800 |
| tree | 4c6a36c574cf6b341ea8fc48ed3326054506afa3 | |
| parent | 2a7c23a67355c56e6fb4df487cb74263f7835828 [diff] | |
| parent | 641f2cf426f163898201fa5af04d4bbb28c0f4d0 [diff] |
resolve merge conflicts of 641f2cf42 to master Test: [sailfish] make ; mmm frameworks/native/vulkan Change-Id: I8555fdfbe6375e6266d07b66b5a8085d37e1ffde