diff options
| author | Ian Kasprzak <iankaz@google.com> | 2019-08-28 21:07:15 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 21:07:15 -0700 |
| commit | 717f846e63f4e576cc46744634c3205156a8a846 (patch) | |
| tree | 2c0bb00db0e872ed4c0b454bba3e638d400cf1bf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 525ef5d57b8dfef14c03b0aa1d3ef75d53ef27be (diff) | |
| parent | 2b7053a0bd76d2b93e292d60d293c6719ac53185 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master am: 33e559a025 -s ours am: 0cd1fdd617 am: 489edfda20
am: 2b7053a0bd -s ours
am skip reason: subject contains skip directive
Change-Id: I0256a2e2638a3c012b33d91bbe2af76855c7f785
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions