Trevor Johns 682c24e228 Resolve merge conflicts of a5060ee to nyc-dev ...

This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086

2016-04-19 02:03:59 -07:00

..

android_test_framework.png

…

eclipse_new_android_project_complete_callouts.png

…

eclipse_new_android_testproject_complete_callouts.png

…

eclipse_test_results.png

…

eclipse_test_run_failure.png

…

hwtest_create_test_class_menu_callouts.png

…

hwtest_junit_success.png

…

hwtest_new_test_class_dialog_complete_callouts.png

…

hwtest_new_test_project_dialog_complete_callouts.png

…

hwtest_new_test_project_menu.png

…

hwtest_runas_menu_callouts.png

…

spinner_create_test_class_callouts.png

…

spinnertest_junit_panel_fail_callouts.png

…

spinnertest_junit_panel_failtrace_callouts.png

…

spinnertest_junit_panel.png

…

spinnertest_junit_success.png

…

spinnertest_new_class_callouts.png

…

spinnertest_runas_menu_callouts.png

…

test_framework.png

…

testing-icon.png

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

UIAutomatorViewer.png

…