tree d3427b8400ea73613777324bc0ce44d6bfb4a6a7
parent 21a13a84d47502504fe48d66edca891bf480748b
parent 7bb3532f92cd54498d6ca9579de06a35ce053570
author Android Build Merger (Role) <android-build-merger@google.com> 1494417840 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494417845 +0000

Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690" into nyc-mr2-dev-plus-aosp