projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af7a952
9b726ab
)
resolve merge conflicts of 9b726ab8 to master
author
Mika Isojärvi
<misojarvi@google.com>
Fri, 22 Sep 2017 17:39:21 +0000
(10:39 -0700)
committer
Mika Isojärvi
<misojarvi@google.com>
Fri, 22 Sep 2017 17:39:21 +0000
(10:39 -0700)
Test: Ran scripts/check_build_sanity.py build Android CTS.
Change-Id: Ibc797d43c71edee9a82592369f30d6a72bfcde2f
1
2
Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Android.mk
Simple merge