tree d4eacb1ab9756b07bbe92ce920902bfbd76f2710
parent 5c53a2c4b7efd87ce40f7862f970fe83db298cd3
parent c4beb34f50aab38835b380213376d5951dbaf20e
author KOUSHIK PANUGANTI <kpanuganti@google.com> 1553812160 -0700
committer android-build-merger <android-build-merger@google.com> 1553812160 -0700

[automerger skipped] Merge "Migrate frameworks/rs to androidx.test" am: fbcad2dae5 am: 60d70376d4
am: c4beb34f50 -s ours
am skip reason: change_id I435234484935f243c8449ba30b8afd44f9f01aae with SHA1 5c53a2c4b7 is in history

Change-Id: I386aa921ea58c028217e51c13cf07d9f6c836a4f