tree f2fd245510eae39ae1876a4c54318b9320ea3288
parent 555c9e32eef62065a8f6954aeb943895ac26ea8f
parent 2e21fc8f6f4a78463759f74f8afa79a5fdbee938
author Ian Lake <ilake@google.com> 1558055633 -0700
committer android-build-merger <android-build-merger@google.com> 1558055633 -0700

Merge "Convert utils to ActivityTestRule Kotlin extensions" into androidx-master-dev
am: 2e21fc8f6f

Change-Id: I93737a29c38e336067ab5d1ee4f1d1c02613f9e0