build · 4be75a84883c6f30618c4496865d41a4e4edc320 · halo / cts · GitLab

History Find file

Merge "resolve merge conflicts of to stage-aosp-master." into stage-aosp-master

Shinichiro Hamaji authored 9 years ago

am: b8be94ec

* commit 'b8be94ec':
  resolve merge conflicts of 928b21e6 to stage-aosp-master.

30d4b292

Name	Last commit	Last update
..
config.mk
deqp_dummy_test_list
device_info_package.mk
module_test_config.mk
support_package.mk
test_deqp_package.mk
test_executable.mk
test_gtest_package.mk
test_host_java_library.mk
test_package.mk
test_target_java_library.mk
test_uiautomator.mk