diff options
author | KOUSHIK PANUGANTI <kpanuganti@google.com> | 2019-03-28 15:29:20 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-28 15:29:20 -0700 |
commit | 9822b047aa4423932fa8dd9ace11cdf16d309d3b (patch) | |
tree | d4eacb1ab9756b07bbe92ce920902bfbd76f2710 | |
parent | 5c53a2c4b7efd87ce40f7862f970fe83db298cd3 (diff) | |
parent | c4beb34f50aab38835b380213376d5951dbaf20e (diff) | |
download | rs-android10-qpr2-s2-release.tar.gz |
[automerger skipped] Merge "Migrate frameworks/rs to androidx.test" am: fbcad2dae5 am: 60d70376d4android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: c4beb34f50 -s ours
am skip reason: change_id I435234484935f243c8449ba30b8afd44f9f01aae with SHA1 5c53a2c4b7 is in history
Change-Id: I386aa921ea58c028217e51c13cf07d9f6c836a4f
0 files changed, 0 insertions, 0 deletions